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

Change-Id: I31785a2978327b7f62e58c9e2e4e6ba089cd1fea