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

Change-Id: Ib824b4ca7856560c829ea11fd71c1c6003fd62fe