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

Change-Id: Iec1b367644a9ca3c4991eb5702740167265b23de