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

Change-Id: Ic09f38273f55aba14f704b917c41ce2d641d4b56
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 02d561a..fab201d 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: "T1007458"
+    build_id: "T1007601"
     target: "train_build"
     source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.configinfrastructure/sdk/configinfrastructure-sdk-current.zip"
   }
@@ -8,7 +8,7 @@
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/ConfigInfrastructure"
-  git_branch: "udc-dev"
+  git_branch: "udc-d1-dev"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 6bd78b7..d33d0a0 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10541443
\ No newline at end of file
+10572802
\ No newline at end of file