diff --git a/MapboxAndroidDemo/build.gradle b/MapboxAndroidDemo/build.gradle
index 3b42b6183..311749b6d 100644
--- a/MapboxAndroidDemo/build.gradle
+++ b/MapboxAndroidDemo/build.gradle
@@ -40,6 +40,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    splits {
+        abi {
+            enable true
+            universalApk true
+        }
+    }
 }
 
 dependencies {
diff --git a/MapboxAndroidDemo/proguard-rules.pro b/MapboxAndroidDemo/proguard-rules.pro
index afd805d76..e915fc39b 100644
--- a/MapboxAndroidDemo/proguard-rules.pro
+++ b/MapboxAndroidDemo/proguard-rules.pro
@@ -21,5 +21,9 @@
 # Picasso
 -dontwarn com.squareup.okhttp.**
 
+-dontwarn android.support.**
+-dontwarn java.lang.**
+-dontwarn org.codehaus.**
 -keep class com.google.**
--dontwarn com.google.**
\ No newline at end of file
+-dontwarn com.google.**
+-dontwarn java.nio.**
\ No newline at end of file
diff --git a/MapboxAndroidWearDemo/proguard-rules.pro b/MapboxAndroidWearDemo/proguard-rules.pro
index 6dab868c8..e915fc39b 100644
--- a/MapboxAndroidWearDemo/proguard-rules.pro
+++ b/MapboxAndroidWearDemo/proguard-rules.pro
@@ -1,17 +1,29 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/antonio/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
+# Retrofit 2
+# Platform calls Class.forName on types which do not exist on Android to determine platform.
+-dontnote retrofit2.Platform
+# Platform used when running on RoboVM on iOS. Will not be used at runtime.
+-dontnote retrofit2.Platform$IOS$MainThreadExecutor
+# Platform used when running on Java 8 VMs. Will not be used at runtime.
+-dontwarn retrofit2.Platform$Java8
+# Retain generic type information for use by reflection by converters and adapters.
+-keepattributes Signature
+# Retain declared checked exceptions for use by a Proxy instance.
+-keepattributes Exceptions
 
-# Add any project specific keep options here:
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+# Gson specific classes
+-dontwarn sun.misc.**
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+-dontwarn okio.**
+-dontwarn okhttp3.**
+
+# Picasso
+-dontwarn com.squareup.okhttp.**
+
+-dontwarn android.support.**
+-dontwarn java.lang.**
+-dontwarn org.codehaus.**
+-keep class com.google.**
+-dontwarn com.google.**
+-dontwarn java.nio.**
\ No newline at end of file
diff --git a/bitrise.yml b/bitrise.yml
index d9104953b..422485027 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -45,7 +45,7 @@ workflows:
 
             echo "Run tests on firebase:"
             gcloud auth activate-service-account --key-file secret.json --project mapbox-android-demo
-            gcloud beta test android run --type robo --app MapboxAndroidDemo/build/outputs/apk/MapboxAndroidDemo-gpservices-debug.apk --device-ids shamu --os-version-ids 22 --locales en --orientations portrait --timeout 10m
+            gcloud beta test android run --type robo --app MapboxAndroidDemo/build/outputs/apk/MapboxAndroidDemo-gpservices-armeabi-v7a-debug.apk --device-ids shamu --os-version-ids 22 --locales en --orientations portrait --timeout 10m
     - deploy-to-bitrise-io:
         inputs:
         - notify_user_groups: none
@@ -54,9 +54,13 @@ workflows:
     - gradle-runner:
         inputs:
         - gradle_task: "$GRADLE_TASK"
-    - sign-apk: {}
+    - sign-apk:
+        inputs:
+        - apk_path: "$BITRISE_APK_PATH_LIST"
+        - apk_file_exclude_filter: "*-unsigned.apk"
     - google-play-deploy:
         inputs:
+        - apk_path: "$BITRISE_SIGNED_APK_PATH_LIST"
         - service_account_json_key_path: "$BITRISEIO_SERVICE_ACCOUNT_JSON_URL"
         - package_name: com.mapbox.mapboxandroiddemo
         - track: beta
diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US
index e6c61ae53..7fa776176 100644
--- a/whatsnew/whatsnew-en-US
+++ b/whatsnew/whatsnew-en-US
@@ -1 +1 @@
-This a minor release that fixes a shader precision issue that created a rendering problem on some devices.
\ No newline at end of file
+Update to 5.1.0-beta.4
\ No newline at end of file