Merge cherrypicks of ['googleplex-android-review.googlesource.com/34048017'] into 25Q2-release.

Change-Id: I00e64dc4bcfcf47d91b163725632fef5ddff10b9
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 13e0db1..02eed7e 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: "13568307"
+    build_id: "13639271"
     target: "train_build"
     source_file: "mainline-sdks/for-Baklava-build/current/com.google.android.rkpd/sdk/rkpd-sdk-current.zip"
   }