Merge cherrypicks of ['googleplex-android-review.googlesource.com/30871990'] into 25Q1-release.

Change-Id: I37241de57a86429ad3ed7d3988d6760bca590de9
tree: c4f56c6f58e0b80d533059dde128f23529580946
  1. .prebuilt_info/
  2. 13/
  3. 7/
  4. current/