Merge cherrypicks of ['googleplex-android-review.googlesource.com/28650652'] into 24Q3-release.

Change-Id: I87880ccf871e74ae42ddddaf16b92ed8a1973616

.prebuilt_info/prebuilt_info_current_current_zip.asciipb

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 8aba2ec..ec4f926 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: "T1010174"
+    build_id: "T1010179"
     target: "train_build"
     source_file: "mainline-sdks/for-latest-build/current/com.google.android.configinfrastructure/sdk/configinfrastructure-sdk-current.zip"
   }

current/snapshot-creation-build-number.txt

diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 6610e58..b55e419 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-12129781
\ No newline at end of file
+12161022
\ No newline at end of file