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

Change-Id: If1f480b4a5f9999b2d71fde50718a6134c5ce754
tree: b3738ef776acd737b794a8822a57a5387461d5cc
  1. .prebuilt_info/
  2. 1/
  3. 13/
  4. 3/
  5. 7/
  6. current/
  7. OWNERS