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

Change-Id: I46e720579fa71fd3620b6f228f20c702dd219ff8
tree: 8cd57ce202515c52ad12f597f40d22cfd52b95cf
  1. .prebuilt_info/
  2. 1/
  3. 13/
  4. 3/
  5. 7/
  6. current/
  7. OWNERS