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

Change-Id: I04cc52d58f20466b7dde414be8e8fd7fdaa95431
tree: f3b4ff08bcc2fba470cb31ede53677a349ca218b
  1. .prebuilt_info/
  2. 1/
  3. 13/
  4. 3/
  5. 7/
  6. current/
  7. OWNERS