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

Change-Id: Ia121037db453dd007287e25efde1bd014f433e8e
tree: 52bfc23074307cb220b63550c05371e2b3256ec1
  1. .prebuilt_info/
  2. 1/
  3. 13/
  4. 3/
  5. 7/
  6. current/
  7. OWNERS