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

Change-Id: I748da41a1ac2dcb53f1f65f0ecd703ff49333cc4