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

Change-Id: I5cc657ee4d88f7bf946d57066239da27edb28964
tree: 186708829b716251943921c3be1b1a03f3b9a560
  1. .prebuilt_info/
  2. 13/
  3. 17/
  4. 7/
  5. current/
  6. METADATA