Merge cherrypicks of ['googleplex-android-review.googlesource.com/29780681', 'googleplex-android-review.googlesource.com/29910155'] into 24Q4-release.

Change-Id: Iaf1bbc2668658e6db810d9035cc3809e23b609aa
tree: c93c031938740edbe0bdd7f4dd3d2d01c36d31cf
  1. .prebuilt_info/
  2. 1/
  3. 10/
  4. 11/
  5. 12/
  6. 13/
  7. 15/
  8. 3/
  9. 4/
  10. 7/
  11. current/
  12. OWNERS