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

Change-Id: Ic2655128bf9204f32c5967807f3c9b1ae5e4b38f
tree: ba95b02fe2f6accf358931aeddf99faf3c711c47
  1. .prebuilt_info/
  2. 13/
  3. 7/
  4. current/