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

Change-Id: Ibf4209a13c685e16cd069cd15b53c5a7c5b15a5f