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

Change-Id: I4d5e547e6e0e63d94dec6edd5ee6ba4a35b441db
tree: 60084892f1b8151c45107237fdd06deab081dedb
  1. .prebuilt_info/
  2. 13/
  3. 17/
  4. 7/
  5. current/
  6. METADATA