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

Change-Id: I58e6e347ea338e6b1db6f0ec80b29fcdfc5f9bd0