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

Change-Id: I426238aad1f341d2d4c280f004c20ec83deee9e4