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

Change-Id: I23347777c43e365dc1a2c7e8dda4bec3661a639e
tree: 16478d73ce450495cbf1572f65e4cd02fd3b47c5
  1. .prebuilt_info/
  2. 10/
  3. 12/
  4. 13/
  5. 15/
  6. 7/
  7. current/