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

Change-Id: I18dae44c8cb78e8c5066eafbd14ef1512efa1fb9