Merge cherrypicks of ['googleplex-android-review.googlesource.com/24055013'] into udc-release.

Change-Id: I60ba4201d30f77b7820a2ea7586e4ca16e860d7e
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 4c1f69d..6f6c1b6 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: "T1007089"
+    build_id: "T1007284"
     target: "train_build"
     source_file: "mainline-sdks/for-UpsideDownCake-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 42ea358..622b3bf 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10351819
\ No newline at end of file
+10484568
\ No newline at end of file