Merge cherrypicks of ['googleplex-android-review.googlesource.com/28994942'] into 24Q3-release.

Change-Id: I1ff15a8f55d9f728f8bd8defb58d73ca5c0e900d
tree: b5133a6d3a3af79003d710c0be5e36ba62e3d1db
  1. .prebuilt_info/
  2. 10/
  3. 12/
  4. 13/
  5. 7/
  6. current/