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

Change-Id: I5502c5ea451276b2c5c5e1bbc4c06e31a03c9f79