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

Change-Id: I1c9ec2846835b02928f951b2c9027f1a97d64a96
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 0a5002b..7a0a0d4 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.healthfitness/sdk/healthfitness-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