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

Change-Id: Ie51fc2b5d97385b9f5061d9daf049a6663e96132