Merge cherrypicks of ['android-review.googlesource.com/3556324', 'googleplex-android-review.googlesource.com/32641702'] into 25Q2-release.

Change-Id: Iccc26973f60ffdd1eb4b997957a9379866121fd0