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

Change-Id: Ie6b961b44cda35b536aae8a1297da8f053526eed
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 30c7496..bb5a830 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: "T1010137"
+    build_id: "T1010146"
     target: "train_build"
     source_file: "mainline-sdks/for-latest-build/current/com.google.android.wifi/sdk/wifi-module-sdk-current.zip"
   }
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index e7cd27c..37c5af0 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-11976196
\ No newline at end of file
+11985099
\ No newline at end of file