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

Change-Id: Id3df4d89111d03ee2824621db0896323b8ebaa4b