diff --git a/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle b/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
index 47cd85bb753..5349f97927a 100644
--- a/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
+++ b/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
@@ -28,14 +28,13 @@ firebaseLibrary {
 }
 
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
 
     namespace "com.google.firebase.appcheck.debug.testing"
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
         versionName version
         multiDexEnabled = true
@@ -46,7 +45,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    testOptions.unitTests.includeAndroidResources = true
+    testOptions {
+        targetSdk project.targetSdkVersion
+        unitTests.includeAndroidResources = true
+    }
 }
 
 dependencies {
diff --git a/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle b/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
index 1d2c538336b..7fd11cfb8f5 100644
--- a/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
+++ b/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
@@ -26,14 +26,13 @@ firebaseLibrary {
 }
 
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
 
     namespace "com.google.firebase.appcheck.debug"
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -43,7 +42,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    testOptions.unitTests.includeAndroidResources = false
+    testOptions {
+        targetSdk project.targetSdkVersion
+        unitTests.includeAndroidResources = false
+    }
 }
 
 dependencies {
diff --git a/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle b/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle
index 5a86d4963bc..168ce8491d9 100644
--- a/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle
+++ b/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle
@@ -24,14 +24,13 @@ firebaseLibrary {
 }
 
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
 
     namespace "com.google.firebase.appcheck.interop"
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -41,7 +40,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    testOptions.unitTests.includeAndroidResources = false
+    testOptions {
+        targetSdk project.targetSdkVersion
+        unitTests.includeAndroidResources = false
+    }
 }
 
 dependencies {
diff --git a/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle b/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
index 0947ec8d494..34a6d5bb595 100644
--- a/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
+++ b/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
@@ -26,14 +26,13 @@ firebaseLibrary {
 }
 
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
 
     namespace "com.google.firebase.appcheck.playintegrity"
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -43,7 +42,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    testOptions.unitTests.includeAndroidResources = false
+    testOptions {
+        targetSdk project.targetSdkVersion
+        unitTests.includeAndroidResources = false
+    }
 }
 
 dependencies {
diff --git a/appcheck/firebase-appcheck-recaptcha/firebase-appcheck-recaptcha.gradle b/appcheck/firebase-appcheck-recaptcha/firebase-appcheck-recaptcha.gradle
index a71cf407b40..8b91c0c7645 100644
--- a/appcheck/firebase-appcheck-recaptcha/firebase-appcheck-recaptcha.gradle
+++ b/appcheck/firebase-appcheck-recaptcha/firebase-appcheck-recaptcha.gradle
@@ -27,14 +27,13 @@ firebaseLibrary {
 }
 
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
 
     namespace "com.google.firebase.appcheck.recaptcha"
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -44,7 +43,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    testOptions.unitTests.includeAndroidResources = false
+    testOptions {
+        targetSdk project.targetSdkVersion
+        unitTests.includeAndroidResources = false
+    }
 }
 
 dependencies {
diff --git a/appcheck/firebase-appcheck/firebase-appcheck.gradle b/appcheck/firebase-appcheck/firebase-appcheck.gradle
index c43505f766a..f8ff9522c9b 100644
--- a/appcheck/firebase-appcheck/firebase-appcheck.gradle
+++ b/appcheck/firebase-appcheck/firebase-appcheck.gradle
@@ -28,14 +28,13 @@ firebaseLibrary {
 }
 
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
 
     namespace "com.google.firebase.appcheck"
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
         multiDexEnabled = true
         versionName version
@@ -45,7 +44,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    testOptions.unitTests.includeAndroidResources = true
+    testOptions {
+        targetSdk project.targetSdkVersion
+        unitTests.includeAndroidResources = true
+    }
 }
 
 kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } }
diff --git a/appcheck/firebase-appcheck/test-app/test-app.gradle b/appcheck/firebase-appcheck/test-app/test-app.gradle
index d7cae53bbf6..7b2a464e87d 100644
--- a/appcheck/firebase-appcheck/test-app/test-app.gradle
+++ b/appcheck/firebase-appcheck/test-app/test-app.gradle
@@ -22,7 +22,7 @@ android {
     defaultConfig {
         applicationId "com.googletest.firebase.appcheck"
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
+        targetSdk project.targetSdkVersion
         versionCode 1
         versionName "1.0"
 
diff --git a/encoders/firebase-decoders-json/firebase-decoders-json.gradle b/encoders/firebase-decoders-json/firebase-decoders-json.gradle
index 60906181a28..8ed7e810adb 100644
--- a/encoders/firebase-decoders-json/firebase-decoders-json.gradle
+++ b/encoders/firebase-decoders-json/firebase-decoders-json.gradle
@@ -28,7 +28,6 @@ android {
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -38,6 +37,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     testOptions {
+        targetSdk project.targetSdkVersion
         unitTests {
             includeAndroidResources = true
         }
diff --git a/encoders/firebase-encoders-json/firebase-encoders-json.gradle b/encoders/firebase-encoders-json/firebase-encoders-json.gradle
index beb4cb70a4b..61623db0db9 100644
--- a/encoders/firebase-encoders-json/firebase-encoders-json.gradle
+++ b/encoders/firebase-encoders-json/firebase-encoders-json.gradle
@@ -31,7 +31,6 @@ android {
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -41,6 +40,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     testOptions {
+        targetSdk project.targetSdkVersion
         unitTests {
             includeAndroidResources = true
         }
diff --git a/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle b/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle
index 7a3f8355819..5f261d5d412 100644
--- a/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle
+++ b/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle
@@ -28,7 +28,6 @@ android {
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -38,6 +37,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     testOptions {
+        targetSdk project.targetSdkVersion
         unitTests {
             includeAndroidResources = true
         }
diff --git a/firebase-appdistribution-api/firebase-appdistribution-api.gradle b/firebase-appdistribution-api/firebase-appdistribution-api.gradle
index 5a097ded575..c2d0dab9001 100644
--- a/firebase-appdistribution-api/firebase-appdistribution-api.gradle
+++ b/firebase-appdistribution-api/firebase-appdistribution-api.gradle
@@ -34,7 +34,6 @@ android {
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         multiDexEnabled true
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -44,6 +43,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     testOptions {
+        targetSdk project.targetSdkVersion
         unitTests {
             includeAndroidResources = true
         }
diff --git a/firebase-appdistribution/firebase-appdistribution.gradle b/firebase-appdistribution/firebase-appdistribution.gradle
index 9239700d1ac..ba8f3155958 100644
--- a/firebase-appdistribution/firebase-appdistribution.gradle
+++ b/firebase-appdistribution/firebase-appdistribution.gradle
@@ -33,7 +33,6 @@ android {
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         multiDexEnabled true
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -46,6 +45,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     testOptions {
+        targetSdk project.targetSdkVersion
         unitTests {
             includeAndroidResources = true
         }
diff --git a/firebase-config/bandwagoner/bandwagoner.gradle b/firebase-config/bandwagoner/bandwagoner.gradle
index fed8ad1427a..d41a602f2df 100644
--- a/firebase-config/bandwagoner/bandwagoner.gradle
+++ b/firebase-config/bandwagoner/bandwagoner.gradle
@@ -35,7 +35,7 @@ android {
     defaultConfig {
         applicationId "com.googletest.firebase.remoteconfig.bandwagoner"
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
+        targetSdk project.targetSdkVersion
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
diff --git a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
index 3c7a507ad18..c1d3994d8c7 100644
--- a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
+++ b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
@@ -32,7 +32,7 @@ firebaseLibrary {
 }
 
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
     namespace "com.google.firebase.crashlytics.ndk"
@@ -40,7 +40,6 @@ android {
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         versionName version
 
         externalNativeBuild {
@@ -60,6 +59,10 @@ android {
             }
         }
     }
+    testOptions {
+        targetSdk project.targetSdkVersion
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
diff --git a/firebase-crashlytics/firebase-crashlytics.gradle b/firebase-crashlytics/firebase-crashlytics.gradle
index 8081045143d..5182efe48ec 100644
--- a/firebase-crashlytics/firebase-crashlytics.gradle
+++ b/firebase-crashlytics/firebase-crashlytics.gradle
@@ -33,15 +33,17 @@ firebaseLibrary {
 }
 
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
     namespace "com.google.firebase.crashlytics"
     compileSdkVersion 37
-    testOptions.unitTests.includeAndroidResources = true
+    testOptions {
+        targetSdk project.targetSdkVersion
+        unitTests.includeAndroidResources = true
+    }
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         versionName version
 
         multiDexEnabled true
diff --git a/firebase-datatransport/firebase-datatransport.gradle.kts b/firebase-datatransport/firebase-datatransport.gradle.kts
index 14ee9707ebb..70b8c351c9a 100644
--- a/firebase-datatransport/firebase-datatransport.gradle.kts
+++ b/firebase-datatransport/firebase-datatransport.gradle.kts
@@ -26,13 +26,12 @@ android {
   val targetSdkVersion: Int by rootProject
   val minSdkVersion: Int by rootProject
 
-  adbOptions { timeOutInMs = 60000 }
+  installation { timeOutInMs = 60000 }
 
   namespace = "com.google.firebase.datatransport"
   compileSdk = compileSdkVersion
   defaultConfig {
     minSdk = minSdkVersion
-    targetSdk = targetSdkVersion
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
   compileOptions {
@@ -40,7 +39,10 @@ android {
     targetCompatibility = JavaVersion.VERSION_1_8
   }
 
-  testOptions { unitTests { isIncludeAndroidResources = true } }
+  testOptions {
+    targetSdk = targetSdkVersion
+    unitTests { isIncludeAndroidResources = true }
+  }
 }
 
 dependencies {
diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle
index 72c57c522c4..11f1a6c2e43 100644
--- a/firebase-firestore/firebase-firestore.gradle
+++ b/firebase-firestore/firebase-firestore.gradle
@@ -59,14 +59,13 @@ protobuf {
 }
 
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
 
     namespace "com.google.firebase.firestore"
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
         versionName version
         multiDexEnabled true
@@ -113,7 +112,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    testOptions.unitTests.includeAndroidResources = true
+    testOptions {
+        targetSdk project.targetSdkVersion
+        unitTests.includeAndroidResources = true
+    }
 
 }
 
diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
index 1a66860b74f..455b0cfd121 100644
--- a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
+++ b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
@@ -34,7 +34,6 @@ android {
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         versionCode 1
         versionName version
         multiDexEnabled true
@@ -72,6 +71,7 @@ android {
     }
 
     testOptions {
+        targetSdk project.targetSdkVersion
         unitTests {
             includeAndroidResources true
         }
diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle
index d2b52bf7fa9..c6a9d906a93 100644
--- a/firebase-inappmessaging/firebase-inappmessaging.gradle
+++ b/firebase-inappmessaging/firebase-inappmessaging.gradle
@@ -56,7 +56,7 @@ protobuf {
 }
 
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
 
@@ -64,7 +64,6 @@ android {
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
       minSdkVersion project.minSdkVersion
-      targetSdkVersion project.targetSdkVersion
       multiDexEnabled true
       versionName version
       testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -96,6 +95,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     testOptions {
+        targetSdk project.targetSdkVersion
         unitTests {
             includeAndroidResources = true
         }
diff --git a/firebase-installations-interop/firebase-installations-interop.gradle b/firebase-installations-interop/firebase-installations-interop.gradle
index 244d28f87d2..672335cdc9c 100644
--- a/firebase-installations-interop/firebase-installations-interop.gradle
+++ b/firebase-installations-interop/firebase-installations-interop.gradle
@@ -29,7 +29,6 @@ android {
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -38,6 +37,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
      }
     testOptions {
+        targetSdk project.targetSdkVersion
         unitTests {
             includeAndroidResources = true
         }
diff --git a/firebase-installations/firebase-installations.gradle b/firebase-installations/firebase-installations.gradle
index b76723c38b2..b21902a90be 100644
--- a/firebase-installations/firebase-installations.gradle
+++ b/firebase-installations/firebase-installations.gradle
@@ -32,7 +32,6 @@ android {
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         multiDexEnabled true
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -42,6 +41,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     testOptions {
+        targetSdk project.targetSdkVersion
         unitTests {
             includeAndroidResources = true
         }
diff --git a/firebase-messaging-directboot/firebase-messaging-directboot.gradle b/firebase-messaging-directboot/firebase-messaging-directboot.gradle
index f26fca21b02..85ab58c836e 100644
--- a/firebase-messaging-directboot/firebase-messaging-directboot.gradle
+++ b/firebase-messaging-directboot/firebase-messaging-directboot.gradle
@@ -27,19 +27,22 @@ firebaseLibrary {
 }
 
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
     namespace "com.google.firebase.messaging.directboot"
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         versionName version
 
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+    testOptions {
+        targetSdk project.targetSdkVersion
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
diff --git a/firebase-messaging/firebase-messaging.gradle.kts b/firebase-messaging/firebase-messaging.gradle.kts
index 40bbba786c9..509d7e6070f 100644
--- a/firebase-messaging/firebase-messaging.gradle.kts
+++ b/firebase-messaging/firebase-messaging.gradle.kts
@@ -63,17 +63,19 @@ android {
   val targetSdkVersion: Int by rootProject
   val minSdkVersion: Int by rootProject
 
-  adbOptions { timeOutInMs = 60000 }
+  installation { timeOutInMs = 60000 }
   namespace = "com.google.firebase.messaging"
   compileSdk = compileSdkVersion
   defaultConfig {
     minSdk = minSdkVersion
-    targetSdk = targetSdkVersion
 
     multiDexEnabled = true
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
-  testOptions { unitTests { isIncludeAndroidResources = true } }
+  testOptions {
+    targetSdk = targetSdkVersion
+    unitTests { isIncludeAndroidResources = true }
+  }
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
diff --git a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
index e30a2c17c1e..da7eb818e75 100644
--- a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
+++ b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
@@ -53,7 +53,6 @@ android {
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         multiDexEnabled true
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -63,6 +62,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     testOptions {
+        targetSdk project.targetSdkVersion
         unitTests {
             includeAndroidResources = true
         }
diff --git a/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle b/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle
index 194b98ffea2..7bbe55a313f 100644
--- a/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle
+++ b/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle
@@ -17,7 +17,7 @@ plugins {
 }
 
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
 
@@ -25,7 +25,7 @@ android {
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
+        targetSdk project.targetSdkVersion
         versionName version
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/firebase-perf/dev-app/dev-app.gradle b/firebase-perf/dev-app/dev-app.gradle
index 325ddd276b0..b23bf4c785c 100644
--- a/firebase-perf/dev-app/dev-app.gradle
+++ b/firebase-perf/dev-app/dev-app.gradle
@@ -51,7 +51,7 @@ android {
         applicationId "com.googletest.firebase.perf.testapp"
 
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
+        targetSdk project.targetSdkVersion
         versionCode 3
         versionName "3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/firebase-perf/e2e-app/e2e-app.gradle b/firebase-perf/e2e-app/e2e-app.gradle
index 55912cdc0c3..4c8dd1c00fa 100644
--- a/firebase-perf/e2e-app/e2e-app.gradle
+++ b/firebase-perf/e2e-app/e2e-app.gradle
@@ -54,7 +54,7 @@ android {
         applicationId "com.google.firebase.testing.fireperf"
 
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
+        targetSdk project.targetSdkVersion
         versionCode 3
         versionName "3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/firebase-perf/firebase-perf.gradle b/firebase-perf/firebase-perf.gradle
index b430dab90f7..eceb84a6ca8 100644
--- a/firebase-perf/firebase-perf.gradle
+++ b/firebase-perf/firebase-perf.gradle
@@ -83,7 +83,7 @@ android {
 
         minSdkVersion project.minSdkVersion
         multiDexEnabled true
-        targetSdkVersion project.targetSdkVersion
+        targetSdk project.targetSdkVersion
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle
index 5be41238122..5e61e63df6a 100644
--- a/firebase-storage/firebase-storage.gradle
+++ b/firebase-storage/firebase-storage.gradle
@@ -32,14 +32,13 @@ firebaseLibrary {
 }
 
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
 
     namespace "com.google.firebase.storage"
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
         multiDexEnabled true
         versionName version
@@ -74,9 +73,13 @@ android {
                 srcDirs "src/test/resources"
             }
         }
+    }
 
-        testOptions.unitTests.includeAndroidResources = true
+    testOptions {
+        targetSdk project.targetSdkVersion
+        unitTests.includeAndroidResources = true
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
diff --git a/firebase-storage/test-app/test-app.gradle b/firebase-storage/test-app/test-app.gradle
index 27c7dc046ea..4f1a5f66f1c 100644
--- a/firebase-storage/test-app/test-app.gradle
+++ b/firebase-storage/test-app/test-app.gradle
@@ -22,7 +22,7 @@ android {
   defaultConfig {
     applicationId "com.example.storage"
     minSdkVersion project.minSdkVersion
-    targetSdkVersion project.targetSdkVersion
+    targetSdk project.targetSdkVersion
     versionCode 1
     versionName "1.0"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/gradle.properties b/gradle.properties
index c1aa7f84562..8260075b335 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,6 @@ firebase.checks.lintProjects=:tools:lint
 
 systemProp.illegal-access=warn
 
-android.useAndroidX=true
\ No newline at end of file
+android.useAndroidX=true
+android.builtInKotlin=false
+android.newDsl=false
\ No newline at end of file
diff --git a/health-metrics/apk-size/app/default.gradle b/health-metrics/apk-size/app/default.gradle
index ce9d60b3dc7..d2d2100feec 100644
--- a/health-metrics/apk-size/app/default.gradle
+++ b/health-metrics/apk-size/app/default.gradle
@@ -17,7 +17,7 @@
  * Default build settings
  */
 android {
-    adbOptions {
+    installation {
         timeOutInMs 60 * 1000
     }
 
diff --git a/integ-testing/integ-testing.gradle.kts b/integ-testing/integ-testing.gradle.kts
index 7a20747a7ca..64103c28f44 100644
--- a/integ-testing/integ-testing.gradle.kts
+++ b/integ-testing/integ-testing.gradle.kts
@@ -26,10 +26,7 @@ android {
   compileSdk = targetSdkVersion
   namespace = "com.google.firebase.testing.integ"
 
-  defaultConfig {
-    minSdk = minSdkVersion
-    targetSdk = targetSdkVersion
-  }
+  defaultConfig { minSdk = minSdkVersion }
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
index a34a519031e..e2c4186c29d 100644
--- a/plugins/build.gradle.kts
+++ b/plugins/build.gradle.kts
@@ -46,14 +46,14 @@ spotless {
 // https://maven.google.com/web/index.html?q=perf-plugin#com.google.firebase:perf-plugin
 // The System property allows us to integrate with an unreleased version from https://bityl.co/3oYt.
 // Refer go/fireperf-plugin-test-on-head for more details.
-val perfPluginVersion = System.getenv("FIREBASE_PERF_PLUGIN_VERSION") ?: "1.4.1"
+val perfPluginVersion = System.getenv("FIREBASE_PERF_PLUGIN_VERSION") ?: "2.0.2"
 
 dependencies {
   // Firebase performance plugin, it should be added here because of how gradle dependency
   // resolution works, otherwise it breaks Fireperf Test Apps.
   // See https://github.com/gradle/gradle/issues/12286
   implementation("com.google.firebase:perf-plugin:$perfPluginVersion")
-  implementation(kotlin("gradle-plugin", "1.8.22"))
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21")
   implementation(libs.org.json)
   implementation(libs.bundles.maven.resolver)
 
diff --git a/protolite-well-known-types/protolite-well-known-types.gradle b/protolite-well-known-types/protolite-well-known-types.gradle
index fe73979660b..fc1edca6885 100644
--- a/protolite-well-known-types/protolite-well-known-types.gradle
+++ b/protolite-well-known-types/protolite-well-known-types.gradle
@@ -46,7 +46,6 @@ android {
     namespace "firebase.com.protolitewrapper"
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
         versionCode 1
         versionName '1.0'
@@ -61,6 +60,10 @@ android {
     }
 
     sourceSets.main.resources.srcDirs = ['build/extracted-protos/main/', 'src/main/proto']
+
+    testOptions {
+        targetSdk project.targetSdkVersion
+    }
 }
 
 
diff --git a/subprojects.cfg b/subprojects.cfg
index c9f6ca804f3..5a9a9932e66 100644
--- a/subprojects.cfg
+++ b/subprojects.cfg
@@ -71,7 +71,7 @@ transport # directory
 transport:transport-api # sdk
 transport:transport-backend-cct # sdk
 transport:transport-runtime # sdk
-transport:transport-runtime-testing # sdk
+transport:transport-runtime-testing # test
 
 # Test Apps
 # disabled since they require google-services.json to build which is not always available in CI.
diff --git a/transport/transport-api/transport-api.gradle b/transport/transport-api/transport-api.gradle
index a805cad4c52..b04adc82b8c 100644
--- a/transport/transport-api/transport-api.gradle
+++ b/transport/transport-api/transport-api.gradle
@@ -28,11 +28,14 @@ android {
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'proguard.txt'
     }
 
+    testOptions {
+        targetSdk project.targetSdkVersion
+    }
+
     compileOptions {
         sourceCompatibility = '1.8'
         targetCompatibility = '1.8'
diff --git a/transport/transport-backend-cct/transport-backend-cct.gradle b/transport/transport-backend-cct/transport-backend-cct.gradle
index 2baae70620d..cdf2105f54c 100644
--- a/transport/transport-backend-cct/transport-backend-cct.gradle
+++ b/transport/transport-backend-cct/transport-backend-cct.gradle
@@ -45,11 +45,14 @@ android {
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         versionName version
         consumerProguardFiles 'proguard.txt'
     }
+    testOptions {
+        targetSdk project.targetSdkVersion
+    }
+
     compileOptions {
         sourceCompatibility = '1.8'
         targetCompatibility = '1.8'
diff --git a/transport/transport-runtime-testing/transport-runtime-testing.gradle b/transport/transport-runtime-testing/transport-runtime-testing.gradle
index 2268e8eea2a..e6ae752e9b9 100644
--- a/transport/transport-runtime-testing/transport-runtime-testing.gradle
+++ b/transport/transport-runtime-testing/transport-runtime-testing.gradle
@@ -22,9 +22,12 @@ android {
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+    testOptions {
+        targetSdk project.targetSdkVersion
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
diff --git a/transport/transport-runtime/transport-runtime.gradle b/transport/transport-runtime/transport-runtime.gradle
index 5ff6fa8b6d1..2aa10c820bb 100644
--- a/transport/transport-runtime/transport-runtime.gradle
+++ b/transport/transport-runtime/transport-runtime.gradle
@@ -69,9 +69,12 @@ android {
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+    testOptions {
+        targetSdk project.targetSdkVersion
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8