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

Change-Id: I65d6e3a77496c6720853bfe52db9dbc9ee5199fd