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

Change-Id: I70c3795347ddb1232a7fe4d08ab615a73d15c71b