diff --git a/Makefile b/Makefile
index 5405d49ab..42b935c26 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,8 @@ clean:
 
 post-install:
 	./node_modules/.bin/remotedev-debugger --hostname localhost --port 5678 --injectserver
-
+	@# Must remove the .babelrc for 0.42.0 to work correctly
+	rm -f node_modules/intl/.babelrc
 	@# Hack to get react-intl and its dependencies to work with react-native
 	@# Based off of https://github.com/este/este/blob/master/gulp/native-fix.js
 	sed -i'' -e 's|"./locale-data/index.js": false|"./locale-data/index.js": "./locale-data/index.js"|g' node_modules/react-intl/package.json
diff --git a/android/app/build.gradle b/android/app/build.gradle
index dde885cd9..67befafe7 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -144,7 +144,7 @@ android {
 
 dependencies {
     compile project(':react-native-push-notification')
-    compile ('com.google.android.gms:play-services-gcm:9.0.0') {
+    compile ('com.google.android.gms:play-services-gcm:9.4.0') {
         force = true;
     }
     compile project(':react-native-device-info')
diff --git a/android/app/src/main/java/com/mattermost/MainApplication.java b/android/app/src/main/java/com/mattermost/MainApplication.java
index 267ad2d11..774ac5ea6 100644
--- a/android/app/src/main/java/com/mattermost/MainApplication.java
+++ b/android/app/src/main/java/com/mattermost/MainApplication.java
@@ -22,7 +22,7 @@ public class MainApplication extends Application implements ReactApplication {
 
   private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
     @Override
-    protected boolean getUseDeveloperSupport() {
+    public boolean getUseDeveloperSupport() {
       return BuildConfig.DEBUG;
     }
 
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 1ef6c7536..14dccca6d 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
+
     <string name="app_name">Mattermost</string>
 </resources>
diff --git a/package.json b/package.json
index 494a6f7dd..92ea61562 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "react": "15.4.1",
     "react-addons-pure-render-mixin": "15.4.1",
     "react-intl": "2.2.2",
-    "react-native": "0.40.0",
+    "react-native": "0.42.0",
     "react-native-button": "1.7.1",
     "react-native-cookies": "2.0.0",
     "react-native-device-info": "0.10.1",