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

Change-Id: I3966cc3f70c37ef7ca328ea82dc84212d8e194b2
tree: 922c462eded8f6e2260612faa785627b05d9bc06
  1. .prebuilt_info/
  2. 1/
  3. 13/
  4. 3/
  5. 7/
  6. current/
  7. OWNERS