diff --git a/android/app/build.gradle b/android/app/build.gradle
index 204400013..6e1117e6b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -113,8 +113,9 @@ android {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 134
+        versionCode 135
         versionName "1.12.0"
+        multiDexEnabled = true
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
@@ -187,15 +188,9 @@ configurations.all {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation ("com.android.support:appcompat-v7:26.1.0") {
-        force = true;
-    }
-    implementation ('com.android.support:design:26.1.0') {
-        force = true;
-    }
-    implementation ('com.android.support:percent:26.1.0') {
-        force = true;
-    }
+    implementation "com.android.support:appcompat-v7:27.1.1"
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:percent:27.1.1'
     implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation project(':react-native-document-picker')
     implementation project(':react-native-keychain')
diff --git a/android/build.gradle b/android/build.gradle
index e19b20fa3..e5b921afd 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.0'
-        classpath 'com.google.gms:google-services:3.1.0'
+        classpath 'com.google.gms:google-services:3.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/android/gradle.properties b/android/gradle.properties
index edb6dfe48..122fdca14 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -11,6 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048M
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit