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

Change-Id: I1c467eb5ca1a1f70b06225d4db193f7f53461d21
tree: 99717376597dee2a7252f11fd96b87eb5d1cc64c
  1. .prebuilt_info/
  2. 13/
  3. 3/
  4. 7/
  5. current/