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

Change-Id: I572d34603339d192f1d4a00468971363c4c51e38
tree: e76159f89e7af77b059dc4e9780fe2f5c02c3862
  1. .prebuilt_info/
  2. 17/
  3. current/
  4. METADATA