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

Change-Id: I00d5a0725d9a91e6c8e9f027509972fc67a7cb48