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

Change-Id: Id7a8764f3ceba2c30f17c47d2ee7b93d200c791e