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

Change-Id: I1b3c39ab4e64948f1a55c061950c5968a212b489
tree: 7fb66a72bfb6b3de57a4d3ed8744064223363eb6
  1. .prebuilt_info/
  2. 17/
  3. current/
  4. METADATA