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

Change-Id: I50a4db406f65670e0f59baee7d5471bb09423139