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

Change-Id: I47748cf6d08180ad94631a28e79150f7ec4456a6
tree: 62288dbda2781568ec74b3f8512980ba3b2afd27
  1. .prebuilt_info/
  2. 13/
  3. 7/
  4. current/