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

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