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

Change-Id: I79ea9c992794e28a8d7e063ff647b63bc964bbe0