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

Change-Id: Ibd807a27874e9f76d77db28ca509b4bf76cc8671
tree: b501aa3350b1f2057b690b25d47bed50dc869536
  1. .prebuilt_info/
  2. 13/
  3. 7/
  4. current/