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

Change-Id: Iaa69ac64706590371f275a4caae0a542873bb553