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

Change-Id: I7435c3a452e2e127b561b2f310bbaacf875a71e4
tree: 99c526b881d4e13e807c084972c27010fff987c2
  1. .prebuilt_info/
  2. 1/
  3. 13/
  4. 2/
  5. 3/
  6. 4/
  7. 7/
  8. current/
  9. OWNERS