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

Change-Id: I2d687f6cef45d1119678e436c0392fdd89526049