Merge cherrypicks of ['android-review.googlesource.com/3480990', 'android-review.googlesource.com/3480104'] into 25Q2-release.

Change-Id: I0c949880f48d52f8fa3e2d7052fdbda92449e95f