diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
index a9601a8883..eba1bdced7 100644
--- a/buildscript-gradle.lockfile
+++ b/buildscript-gradle.lockfile
@@ -2,45 +2,45 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 # To regenerate this file, run: ./gradlew dependencies --write-locks
-androidx.databinding:databinding-common:9.3.2=classpath
-androidx.databinding:databinding-compiler-common:9.3.2=classpath
+androidx.databinding:databinding-common:9.4.0=classpath
+androidx.databinding:databinding-compiler-common:9.4.0=classpath
 androidx.room:androidx.room.gradle.plugin:2.8.4=classpath
 androidx.room:room-gradle-plugin:2.8.4=classpath
-com.android.application:com.android.application.gradle.plugin:9.3.2=classpath
-com.android.databinding:baseLibrary:9.3.2=classpath
-com.android.library:com.android.library.gradle.plugin:9.3.2=classpath
-com.android.tools.analytics-library:crash:32.3.2=classpath
-com.android.tools.analytics-library:protos:32.3.2=classpath
-com.android.tools.analytics-library:shared:32.3.2=classpath
-com.android.tools.analytics-library:tracker:32.3.2=classpath
+com.android.application:com.android.application.gradle.plugin:9.4.0=classpath
+com.android.databinding:baseLibrary:9.4.0=classpath
+com.android.library:com.android.library.gradle.plugin:9.4.0=classpath
+com.android.tools.analytics-library:crash:32.4.0=classpath
+com.android.tools.analytics-library:protos:32.4.0=classpath
+com.android.tools.analytics-library:shared:32.4.0=classpath
+com.android.tools.analytics-library:tracker:32.4.0=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath
-com.android.tools.build:aapt2-proto:9.3.2-15703166=classpath
-com.android.tools.build:aaptcompiler:9.3.2=classpath
-com.android.tools.build:apksig:9.3.2=classpath
-com.android.tools.build:apkzlib:9.3.2=classpath
-com.android.tools.build:builder-model:9.3.2=classpath
-com.android.tools.build:builder-test-api:9.3.2=classpath
-com.android.tools.build:builder:9.3.2=classpath
+com.android.tools.build:aapt2-proto:9.4.0-15978811=classpath
+com.android.tools.build:aaptcompiler:9.4.0=classpath
+com.android.tools.build:apksig:9.4.0=classpath
+com.android.tools.build:apkzlib:9.4.0=classpath
+com.android.tools.build:builder-model:9.4.0=classpath
+com.android.tools.build:builder-test-api:9.4.0=classpath
+com.android.tools.build:builder:9.4.0=classpath
 com.android.tools.build:bundletool:1.18.3=classpath
-com.android.tools.build:gradle-api:9.3.2=classpath
-com.android.tools.build:gradle-common-api:9.3.2=classpath
-com.android.tools.build:gradle-settings-api:9.3.2=classpath
-com.android.tools.build:gradle:9.3.2=classpath
-com.android.tools.build:manifest-merger:32.3.2=classpath
-com.android.tools.ddms:ddmlib:32.3.2=classpath
-com.android.tools.layoutlib:layoutlib-api:32.3.2=classpath
-com.android.tools.lint:lint-model:32.3.2=classpath
-com.android.tools.lint:lint-typedef-remover:32.3.2=classpath
-com.android.tools.utp:gradle-work-action-api:32.3.2=classpath
-com.android.tools:annotations:32.3.2=classpath
-com.android.tools:common:32.3.2=classpath
-com.android.tools:dvlib:32.3.2=classpath
-com.android.tools:repository:32.3.2=classpath
-com.android.tools:sdk-common:32.3.2=classpath
-com.android.tools:sdklib:32.3.2=classpath
-com.android:signflinger:9.3.2=classpath
-com.android:zipflinger:9.3.2=classpath
+com.android.tools.build:gradle-api:9.4.0=classpath
+com.android.tools.build:gradle-common-api:9.4.0=classpath
+com.android.tools.build:gradle-settings-api:9.4.0=classpath
+com.android.tools.build:gradle:9.4.0=classpath
+com.android.tools.build:manifest-merger:32.4.0=classpath
+com.android.tools.ddms:ddmlib:32.4.0=classpath
+com.android.tools.layoutlib:layoutlib-api:32.4.0=classpath
+com.android.tools.lint:lint-model:32.4.0=classpath
+com.android.tools.lint:lint-typedef-remover:32.4.0=classpath
+com.android.tools.utp:gradle-work-action-api:32.4.0=classpath
+com.android.tools:annotations:32.4.0=classpath
+com.android.tools:common:32.4.0=classpath
+com.android.tools:dvlib:32.4.0=classpath
+com.android.tools:repository:32.4.0=classpath
+com.android.tools:sdk-common:32.4.0=classpath
+com.android.tools:sdklib:32.4.0=classpath
+com.android:signflinger:9.4.0=classpath
+com.android:zipflinger:9.4.0=classpath
 com.google.android.gms:strict-version-matcher-plugin:1.2.4=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
@@ -87,9 +87,9 @@ org.apache.httpcomponents:httpclient:4.5.14=classpath
 org.apache.httpcomponents:httpcore:4.4.16=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bitbucket.b_c:jose4j:0.9.5=classpath
-org.bouncycastle:bcpkix-jdk18on:1.79=classpath
-org.bouncycastle:bcprov-jdk18on:1.79=classpath
-org.bouncycastle:bcutil-jdk18on:1.79=classpath
+org.bouncycastle:bcpkix-jdk18on:1.80.2=classpath
+org.bouncycastle:bcprov-jdk18on:1.80.2=classpath
+org.bouncycastle:bcutil-jdk18on:1.80.2=classpath
 org.checkerframework:checker-qual:3.43.0=classpath
 org.freemarker:freemarker:2.3.32=classpath
 org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bb97c5af96..d0fa296f36 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ targetSdk = "37"
 minSdk = "29"
 
 # Dependency Versions
-androidGradlePlugin = "9.3.2"
+androidGradlePlugin = "9.4.0"
 androidxActivity = "1.13.0"
 androidxAppCompat = "1.8.0"
 androdixAutofill = "1.3.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 84c5a9c661..760c45969c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
+distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500