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

Change-Id: I043506f035f6d3f6257d1563b59eba4843782a11