Merge cherrypicks of ['googleplex-android-review.googlesource.com/26048908', 'googleplex-android-review.googlesource.com/26049212'] into 24Q1-release.

Change-Id: I9756bb1c05d1cf8067a067da5b351957947c48fb
tree: 9dbf04c8a3bd9209011a5137d04cca722fea4463
  1. .prebuilt_info/
  2. 7/
  3. current/
  4. go/