Merge cherrypicks of [19098516] into tm-release.

Change-Id: I08dbc4c9e431237921e57cd49c5d9693bc7f9f59
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index fb61cfa..143bb64 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1004231"
+    build_id: "T1004275"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.appsearch/sdk/appsearch-sdk-current.zip"
   }
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index cd5bf8f..72f44c0 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8749181
\ No newline at end of file
+8762357
\ No newline at end of file