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

Change-Id: I23e00d94962e922d2b92d53acad9d38b08ff280c