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

Change-Id: I4c9f4735689e8274f9268d2b5fc8f59399edca2e