Merge cherrypicks of ['googleplex-android-review.googlesource.com/29780678', 'googleplex-android-review.googlesource.com/29911323'] into 24Q4-release.

Change-Id: I46e720579fa71fd3620b6f228f20c702dd219ff8
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 3654cce..00cd4cb 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: "12373408"
+    build_id: "12509279"
     target: "train_build"
     source_file: "mainline-sdks/for-latest-build/current/com.google.android.media/sdk/media-module-sdk-current.zip"
   }
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 5023f1a..f752db6 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-12185175
\ No newline at end of file
+12090779
\ No newline at end of file