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

Change-Id: I265f5cd836472adfd304b73ae09f66b259a478f3