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

Change-Id: I8dbe5b01b4821d254fe5b683c97f1eeb26e12ecc