diff --git a/android/benchmark/build.gradle b/android/benchmark/build.gradle
index d76793fe49..e12b596ea7 100644
--- a/android/benchmark/build.gradle
+++ b/android/benchmark/build.gradle
@@ -49,7 +49,7 @@ android {
         }
         benchmark {
             debuggable true
-            minifyEnabled true
+            minifyEnabled false
             shrinkResources true
             testProguardFiles 'test.pro'
             signingConfig = debug.signingConfig
diff --git a/android/gradle.properties b/android/gradle.properties
index 7ee54f0243..b84b746f4f 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -26,6 +26,5 @@ org.gradle.parallel=true
 org.gradle.caching=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=false
-android.jetifier.ignorelist=android-base-common,common
-org.gradle.configuration-cache= true
-org.gradle.configuration-cache.problems=warn
\ No newline at end of file
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.problems=warn
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
index 4f5f930afa..eaf3be820c 100644
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -64,13 +64,14 @@ digitap = "1.4.4"
 facebook-applinks = "17.0.1"
 facebook-shimmer = "0.5.0"
 finarkein = "0.5.2"
-firebase-bom = "33.1.2"
+firebase-bom = "33.4.0"
 firebase-crashlytics = "3.0.2"
 firebase-perf = "1.4.2"
 glide = "4.14.2"
 gojek-courier = "0.2.9"
 google-services = "4.4.2"
 gson = "2.11.0"
+guava = "33.3.1-android"
 hamcrest = "2.2"
 hilt = "2.48"
 hms = "2.9.0"
@@ -101,7 +102,7 @@ navi-adverse = "1.6.1"
 navi-alfred = "1.15.2"
 navi-guarddog = "3.7.0"
 navi-pulse = "1.8.0"
-navi-uitron = "1.26.0"
+navi-uitron = "1.27.0"
 navigation = "2.5.3"
 okhttp-bom = "4.12.0"
 otaliastudios-cameraview = "2.7.2"
@@ -294,8 +295,6 @@ firebase-perf = { module = "com.google.firebase:firebase-perf" }
 glide-glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
 glide-ksp = { module = "com.github.bumptech.glide:ksp", version.ref = "glide" }
 
-gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
-
 gojek-courier-courier = { module = "com.gojek.courier:courier", version.ref = "gojek-courier" }
 gojek-courier-mqttClient = { module = "com.gojek.courier:mqtt-client", version.ref = "gojek-courier" }
 gojek-courier-timerPingsender = { module = "com.gojek.courier:timer-pingsender", version.ref = "gojek-courier" }
@@ -303,6 +302,10 @@ gojek-courier-courierMessageAdapterGson = { module = "com.gojek.courier:courier-
 gojek-courier-courierMessageAdapterText = { module = "com.gojek.courier:courier-message-adapter-text", version.ref = "gojek-courier" }
 gojek-courier-courierStreamAdapterRxjava2 = { module = "com.gojek.courier:courier-stream-adapter-rxjava2", version.ref = "gojek-courier" }
 
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
+
+guava = { module = "com.google.guava:guava", version.ref = "guava" }
+
 hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
 
 hms-androidSdk = { module = "live.100ms:android-sdk", version.ref = "hms" }
diff --git a/android/navi-base/build.gradle b/android/navi-base/build.gradle
index 3042f87b9f..09714dd92f 100644
--- a/android/navi-base/build.gradle
+++ b/android/navi-base/build.gradle
@@ -81,6 +81,7 @@ dependencies {
     api libs.firebase.analytics
     api libs.firebase.firestore
     api libs.gson
+    api libs.guava
     api libs.jakewharton.timber
     api libs.navi.guarddog
     api libs.okhttp.brotli
diff --git a/android/navi-widgets/build.gradle b/android/navi-widgets/build.gradle
index f5f968b6f4..58f7105c02 100644
--- a/android/navi-widgets/build.gradle
+++ b/android/navi-widgets/build.gradle
@@ -63,21 +63,13 @@ dependencies {
     api libs.accompanist.pagerIndicators
     api libs.androidx.compose.ui.toolingPreview
     api libs.androidx.compose.ui.util
-    api(libs.androidx.media3.exoplayer) {
-        exclude group: "com.google.guava", module: "guava"
-    }
-    api(libs.androidx.media3.exoplayerHls) {
-        exclude group: "com.google.guava", module: "guava"
-    }
-    api(libs.androidx.media3.ui) {
-        exclude group: "com.google.guava", module: "guava"
-    }
+    api libs.androidx.media3.exoplayer
+    api libs.androidx.media3.exoplayerHls
+    api libs.androidx.media3.ui
     api libs.androidx.paging.runtime.ktx
     api libs.masayukiSuda.easingInterpolator
     api libs.navi.adverse
-    api (libs.navi.uitron) {
-        exclude group: "com.google.guava", module: "guava"
-    }
+    api libs.navi.uitron
 
     implementation libs.android.flexbox
     implementation libs.android.material