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

Change-Id: I94aa7a459b6688f81a844fa7641cdd0414570287
tree: de302ba3bd2c9683a4a6a442ff4a274f0a930303
  1. .prebuilt_info/
  2. 10/
  3. 13/
  4. 15/
  5. 3/
  6. 7/
  7. current/