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

Change-Id: I33caeda01787a6facf8ca281bacf48f582401a2e