diff --git a/submodules/ApiDemos b/submodules/ApiDemos
index 8a7c7d735..43889d79c 160000
--- a/submodules/ApiDemos
+++ b/submodules/ApiDemos
@@ -1 +1 @@
-Subproject commit 8a7c7d735ad2bc2620f310ded26ab5387dc526c6
+Subproject commit 43889d79c5dc1ef4a0c90d0be136f506a2b19c3b
diff --git a/submodules/sample-code b/submodules/sample-code
index ded951dd1..5f8bf4624 160000
--- a/submodules/sample-code
+++ b/submodules/sample-code
@@ -1 +1 @@
-Subproject commit ded951dd19ee41564de7387a0465995dd7b86f37
+Subproject commit 5f8bf462472f7431380b7598af2bfbe1cf2f76b2
diff --git a/test/functional/android/apidemos/find/by-accessibility-id-specs.js b/test/functional/android/apidemos/find/by-accessibility-id-specs.js
index 8f7dc7ec8..b741d66a2 100644
--- a/test/functional/android/apidemos/find/by-accessibility-id-specs.js
+++ b/test/functional/android/apidemos/find/by-accessibility-id-specs.js
@@ -18,4 +18,9 @@ describe("apidemo - find - by accessibility id", function () {
       els.length.should.equal(1);
     }).nodeify(done);
   });
+  it('should find an element with a content-desc property containing an apostrophe', function (done) {
+    driver.element('accessibility id', "Access'ibility").then(function (el) {
+      el.should.exist;
+    }).nodeify(done);
+  });
 });
diff --git a/test/functional/ios/testapp/find-element-specs.js b/test/functional/ios/testapp/find-element-specs.js
index 1890d1c99..d05a0bea4 100644
--- a/test/functional/ios/testapp/find-element-specs.js
+++ b/test/functional/ios/testapp/find-element-specs.js
@@ -110,6 +110,12 @@ describe('testapp - find element', function () {
       .nodeify(done);
   });
 
+  it('should find an element with accessibility id containing an apostrophe', function (done) {
+    driver.element('accessibility id', "Access'ibility").then(function (el) {
+      el.should.exist;
+    }).nodeify(done);
+  });
+
   it('should not find element by incomplete class name but return respective error code', function (done) {
     driver.elementsByClassName('notAValidReference')
       .catch(function (err) {