Merge cherrypicks of ['googleplex-android-review.googlesource.com/32972102'] into 25Q2-release. Change-Id: I13ed47b2b0e7717868da9152a2fb47ee81fc3367