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

Change-Id: I7eded9fcdc245174827adeeebcd4e8d57e0bee8c