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

Change-Id: I115345fb8d4cbfdef13a784e639a88320bc06b6c