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

Change-Id: I323e1d14aba56c2cf1b04e730f6f3231a06c8dd7