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

Change-Id: I96eb48d3c2781b7b554c5faf7174b208713e542d
tree: 89895eb1d0c638924199e794dd80ed9050aaa25a
  1. .prebuilt_info/
  2. 10/
  3. 12/
  4. 13/
  5. 15/
  6. 16/
  7. 7/
  8. current/