diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3201cdd65..a66cf20b8 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -166,6 +166,22 @@ android {
     }
 }
 
+repositories {
+    maven {
+        url 'https://maven.google.com'
+    }
+}
+
+configurations.all {
+    resolutionStrategy {
+        eachDependency { DependencyResolveDetails details ->
+            if (details.requested.name == 'android-jsc') {
+                details.useTarget group: details.requested.group, name: 'android-jsc-intl', version: 'r216113'
+            }
+        }
+    }
+}
+
 dependencies {
     compile project(':react-native-document-picker')
     compile project(':react-native-keychain')
diff --git a/android/build.gradle b/android/build.gradle
index ef0e6d195..792f40bb3 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,5 +21,9 @@ allprojects {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../node_modules/react-native/android"
         }
+        maven {
+            // Local Maven repo containing AARs with JSC library built for Android
+            url "$rootDir/../node_modules/jsc-android/android"
+        }
     }
 }
diff --git a/app/mattermost.js b/app/mattermost.js
index f51e426df..bb3195198 100644
--- a/app/mattermost.js
+++ b/app/mattermost.js
@@ -2,7 +2,6 @@
 // See License.txt for license information.
 
 /* eslint-disable global-require*/
-import 'babel-polyfill';
 import {
     Alert,
     AppState,
diff --git a/package-lock.json b/package-lock.json
index 4f3097c9b..cdce33207 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3980,6 +3980,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+      "dev": true,
       "requires": {
         "babel-runtime": "^6.26.0",
         "core-js": "^2.5.0",
@@ -9411,6 +9412,11 @@
       "dev": true,
       "optional": true
     },
+    "jsc-android": {
+      "version": "216113.0.3",
+      "resolved": "https://registry.npmjs.org/jsc-android/-/jsc-android-216113.0.3.tgz",
+      "integrity": "sha512-x5na/rMdZk3wBsavoOw35BBEzB8coFnTioDdFur040zMR6ShkYCLJXe7junb5vNH58ZsbWj/BrTa7cPnbvV8ug=="
+    },
     "jsdom": {
       "version": "11.10.0",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.10.0.tgz",
@@ -9896,10 +9902,10 @@
           "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
           "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
           "requires": {
-            "lodash": "4.17.5",
-            "lodash-es": "4.17.8",
-            "loose-envify": "1.3.1",
-            "symbol-observable": "1.2.0"
+            "lodash": "^4.2.1",
+            "lodash-es": "^4.2.1",
+            "loose-envify": "^1.1.0",
+            "symbol-observable": "^1.0.3"
           }
         },
         "redux-batched-actions": {
@@ -9912,9 +9918,9 @@
           "resolved": "https://registry.npmjs.org/redux-persist/-/redux-persist-4.9.1.tgz",
           "integrity": "sha512-XoOmfPyo9GEU/WLH9FgB47dNIN9l5ArjHes4o7vUWx9nxZoPxnVodhuHdyc4Ot+fMkdj3L2LTqSHhwrkr0QFUg==",
           "requires": {
-            "json-stringify-safe": "5.0.1",
-            "lodash": "4.17.5",
-            "lodash-es": "4.17.8"
+            "json-stringify-safe": "^5.0.1",
+            "lodash": "^4.17.4",
+            "lodash-es": "^4.17.4"
           }
         }
       }
@@ -14490,12 +14496,12 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
           "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.2",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         }
       }
@@ -14963,7 +14969,8 @@
     "regenerator-runtime": {
       "version": "0.10.5",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+      "dev": true
     },
     "regenerator-transform": {
       "version": "0.12.3",
diff --git a/package.json b/package.json
index 258c4e40f..f628962b7 100644
--- a/package.json
+++ b/package.json
@@ -8,13 +8,13 @@
   "private": true,
   "dependencies": {
     "analytics-react-native": "1.2.0",
-    "babel-polyfill": "6.26.0",
     "commonmark": "github:mattermost/commonmark.js#21742b9d51070b6abba82d88590a0c51ee552a47",
     "commonmark-react-renderer": "mattermost/commonmark-react-renderer#86fa63f898802953842526c2030f3b63c5d1ae7a",
     "deep-equal": "1.0.1",
     "fuse.js": "^3.2.0",
     "intl": "1.2.5",
     "jail-monkey": "1.0.0",
+    "jsc-android": "216113.0.3",
     "mattermost-redux": "github:mattermost/mattermost-redux#238f9472caea3f11be066374f326f398978504c5",
     "prop-types": "15.6.1",
     "react": "16.3.2",