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

Change-Id: I87880ccf871e74ae42ddddaf16b92ed8a1973616
tree: 4993620a76c9deac30e7cd3623219cbca047a89c
  1. .prebuilt_info/
  2. 13/
  3. 7/
  4. current/