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

Change-Id: I4a1a5d3e0598d16c4333c0a5e41dc06d26fb2e33
tree: 74fb8a540ea2e8225b835b159acaee4fae648bc7
  1. .prebuilt_info/
  2. 1/
  3. 13/
  4. 3/
  5. 7/
  6. current/
  7. OWNERS