diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 73ca3d37..9d2a7e4e 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -23,7 +23,7 @@
 -keepattributes Signature
 -keepattributes Annotation
 -keep class okhttp3.** { *; }
--keep class com.mapbox.android.core.location** { *; }
+ç
 -keep interface okhttp3.** { *; }
 -dontwarn okhttp3.**
 -dontwarn okio.**
diff --git a/libandroid-navigation-ui/proguard-consumer.pro b/libandroid-navigation-ui/proguard-consumer.pro
index 6468c980..fe9bd4da 100644
--- a/libandroid-navigation-ui/proguard-consumer.pro
+++ b/libandroid-navigation-ui/proguard-consumer.pro
@@ -4,7 +4,12 @@
 -dontwarn okhttp3.**
 # A resource is loaded with a relative path so the package of this class must be preserved.
 -keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
--keepnames class com.mapbox.android.core.location.LocationEngine
+
+-dontwarn com.mapbox.android.core.location.**
+-keep class com.mapbox.android.core.location.** { *; }
+
+-keep class com.google.android.gms.** { *; }
+-dontwarn com.google.android.gms.**
 
 # --- Picasso ---
 -dontwarn com.squareup.okhttp.**
diff --git a/libandroid-navigation/proguard-consumer.pro b/libandroid-navigation/proguard-consumer.pro
index e8146d99..6a5e66e5 100644
--- a/libandroid-navigation/proguard-consumer.pro
+++ b/libandroid-navigation/proguard-consumer.pro
@@ -5,7 +5,13 @@
 -dontwarn okio.**
 # A resource is loaded with a relative path so the package of this class must be preserved.
 -keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
--keepnames class com.mapbox.android.core.location.LocationEngine
+
+-dontwarn com.mapbox.android.core.location.**
+-keep class com.mapbox.android.core.location.** { *; }
+
+-keep class com.google.android.gms.** { *; }
+-dontwarn com.google.android.gms.**
+
 # --- Java ---
 -dontwarn java.awt.Color