diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
index 9296b11533..0dc8af5cb7 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.2.1=classpath
-androidx.databinding:databinding-compiler-common:9.2.1=classpath
+androidx.databinding:databinding-common:9.3.1=classpath
+androidx.databinding:databinding-compiler-common:9.3.1=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.2.1=classpath
-com.android.databinding:baseLibrary:9.2.1=classpath
-com.android.library:com.android.library.gradle.plugin:9.2.1=classpath
-com.android.tools.analytics-library:crash:32.2.1=classpath
-com.android.tools.analytics-library:protos:32.2.1=classpath
-com.android.tools.analytics-library:shared:32.2.1=classpath
-com.android.tools.analytics-library:tracker:32.2.1=classpath
+com.android.application:com.android.application.gradle.plugin:9.3.1=classpath
+com.android.databinding:baseLibrary:9.3.1=classpath
+com.android.library:com.android.library.gradle.plugin:9.3.1=classpath
+com.android.tools.analytics-library:crash:32.3.1=classpath
+com.android.tools.analytics-library:protos:32.3.1=classpath
+com.android.tools.analytics-library:shared:32.3.1=classpath
+com.android.tools.analytics-library:tracker:32.3.1=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.2.1-15009934=classpath
-com.android.tools.build:aaptcompiler:9.2.1=classpath
-com.android.tools.build:apksig:9.2.1=classpath
-com.android.tools.build:apkzlib:9.2.1=classpath
-com.android.tools.build:builder-model:9.2.1=classpath
-com.android.tools.build:builder-test-api:9.2.1=classpath
-com.android.tools.build:builder:9.2.1=classpath
+com.android.tools.build:aapt2-proto:9.3.1-15703166=classpath
+com.android.tools.build:aaptcompiler:9.3.1=classpath
+com.android.tools.build:apksig:9.3.1=classpath
+com.android.tools.build:apkzlib:9.3.1=classpath
+com.android.tools.build:builder-model:9.3.1=classpath
+com.android.tools.build:builder-test-api:9.3.1=classpath
+com.android.tools.build:builder:9.3.1=classpath
 com.android.tools.build:bundletool:1.18.3=classpath
-com.android.tools.build:gradle-api:9.2.1=classpath
-com.android.tools.build:gradle-common-api:9.2.1=classpath
-com.android.tools.build:gradle-settings-api:9.2.1=classpath
-com.android.tools.build:gradle:9.2.1=classpath
-com.android.tools.build:manifest-merger:32.2.1=classpath
-com.android.tools.ddms:ddmlib:32.2.1=classpath
-com.android.tools.layoutlib:layoutlib-api:32.2.1=classpath
-com.android.tools.lint:lint-model:32.2.1=classpath
-com.android.tools.lint:lint-typedef-remover:32.2.1=classpath
-com.android.tools.utp:gradle-work-action-api:32.2.1=classpath
-com.android.tools:annotations:32.2.1=classpath
-com.android.tools:common:32.2.1=classpath
-com.android.tools:dvlib:32.2.1=classpath
-com.android.tools:repository:32.2.1=classpath
-com.android.tools:sdk-common:32.2.1=classpath
-com.android.tools:sdklib:32.2.1=classpath
-com.android:signflinger:9.2.1=classpath
-com.android:zipflinger:9.2.1=classpath
+com.android.tools.build:gradle-api:9.3.1=classpath
+com.android.tools.build:gradle-common-api:9.3.1=classpath
+com.android.tools.build:gradle-settings-api:9.3.1=classpath
+com.android.tools.build:gradle:9.3.1=classpath
+com.android.tools.build:manifest-merger:32.3.1=classpath
+com.android.tools.ddms:ddmlib:32.3.1=classpath
+com.android.tools.layoutlib:layoutlib-api:32.3.1=classpath
+com.android.tools.lint:lint-model:32.3.1=classpath
+com.android.tools.lint:lint-typedef-remover:32.3.1=classpath
+com.android.tools.utp:gradle-work-action-api:32.3.1=classpath
+com.android.tools:annotations:32.3.1=classpath
+com.android.tools:common:32.3.1=classpath
+com.android.tools:dvlib:32.3.1=classpath
+com.android.tools:repository:32.3.1=classpath
+com.android.tools:sdk-common:32.3.1=classpath
+com.android.tools:sdklib:32.3.1=classpath
+com.android:signflinger:9.3.1=classpath
+com.android:zipflinger:9.3.1=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
@@ -53,12 +53,12 @@ com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:2.3.9=classpath
 com.google.devtools.ksp:symbol-processing-api:2.3.9=classpath
 com.google.devtools.ksp:symbol-processing-common-deps:2.3.9=classpath
 com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.9=classpath
-com.google.errorprone:error_prone_annotations:2.28.0=classpath
+com.google.errorprone:error_prone_annotations:2.36.0=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.gms.google-services:com.google.gms.google-services.gradle.plugin:4.5.0=classpath
 com.google.gms:google-services:4.5.0=classpath
 com.google.guava:failureaccess:1.0.2=classpath
-com.google.guava:guava:33.3.1-jre=classpath
+com.google.guava:guava:33.4.0-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:3.0.0=classpath
 com.google.jimfs:jimfs:1.1=classpath
@@ -114,10 +114,10 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.0=classpath
 org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.4.0=classpath
 org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.4.0=classpath
 org.jetbrains.kotlin:kotlin-native-utils:2.4.0=classpath
-org.jetbrains.kotlin:kotlin-reflect:2.3.21=classpath
+org.jetbrains.kotlin:kotlin-reflect:2.4.0=classpath
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.10=classpath
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib:2.3.21=classpath
+org.jetbrains.kotlin:kotlin-stdlib:2.4.0=classpath
 org.jetbrains.kotlin:kotlin-tooling-core:2.4.0=classpath
 org.jetbrains.kotlin:kotlin-util-io:2.4.0=classpath
 org.jetbrains.kotlin:kotlin-util-klib-metadata:2.4.0=classpath
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1cf8fa0206..f92816ceb0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ targetSdk = "37"
 minSdk = "29"
 
 # Dependency Versions
-androidGradlePlugin = "9.2.1"
+androidGradlePlugin = "9.3.1"
 androidxActivity = "1.13.0"
 androidxAppCompat = "1.7.1"
 androdixAutofill = "1.3.0"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b1b8ef56b4..eddabd2eef 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dbe66e1d66..84c5a9c661 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=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500