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

Change-Id: I122db862d2b5f2a9f68974b18dc40babb6697840