Merge cherrypicks of ['android-review.googlesource.com/3560367', 'android-review.googlesource.com/3560368', 'android-review.googlesource.com/3562025'] into 25Q2-release.

Change-Id: Iac89858f66d54789ced30de883a93865c2c365d4