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

Change-Id: I3e3398b3e5ca0025cb89d43c8ffe171af44f17c9
tree: 026c9984655fcb5538f4039ac37bb2fa49953765
  1. .prebuilt_info/
  2. 13/
  3. current/