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

Change-Id: I8990f5caa694b2c362e9dbce8814dd77e2effe36