Merge cherrypicks of ['googleplex-android-review.googlesource.com/29778878', 'googleplex-android-review.googlesource.com/29907437'] into 24Q4-release.

Change-Id: I0957d75d018c844174b578e6ba6a2fe2430fa3fa
tree: d8a9b3b138f41455a7173d8a01d8c6c30c733415
  1. .prebuilt_info/
  2. 13/
  3. 3/
  4. 7/
  5. current/