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

Change-Id: I0e5e96f3e03e8a7418f20cc361c024d5742a347e
tree: d5ca432620c3214a5445ff618592816f209d2b10
  1. .prebuilt_info/
  2. 13/
  3. 7/
  4. current/