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

Change-Id: Id9a49fa7ae57a692eee4fbc4c245b2bf221a00ec
tree: b0c389d6cd6ecf2230519c2c6166a4754f10166a
  1. .prebuilt_info/
  2. 12/
  3. 13/
  4. 15/
  5. 3/
  6. 7/
  7. current/