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

Change-Id: I75d2b010fd0661b5713b7bb84ac9a3d8d2062bf8