diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 13eee6107a..5ef3c55cc4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 [versions]
-agp = "9.0.1"
+agp = "9.4.0"
 android-compileSdk = "36"
 androidx-lifecycle = "2.10.0"
 androidx-lint-gradle = "1.0.0"
diff --git a/samples/settings.gradle.kts b/samples/settings.gradle.kts
index b431102dfb..0211b4eda0 100644
--- a/samples/settings.gradle.kts
+++ b/samples/settings.gradle.kts
@@ -19,7 +19,7 @@ pluginManagement {
   }
   plugins {
     id("com.gradle.develocity") version "4.5.0"
-    id("com.android.settings") version "9.2.1"
+    id("com.android.settings") version "9.4.0"
   }
 }