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

Change-Id: I22b2acffedba50535fca31a19da268c7e8b1750a
tree: 579534d6eac34e2946c1cfc14406e50a8376f92b
  1. .prebuilt_info/
  2. 13/
  3. 7/
  4. current/