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

Change-Id: I283ac8cf3eeeb37d7854b8d093da3ff577e9abf9