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

Change-Id: I9403cd87dced01c2bcdf015b627a567b58d33c76