Merge cherrypicks of ['googleplex-android-review.googlesource.com/33226827'] into 25Q2-release. Change-Id: I62b1cb7ffcbfd41f6fc514319fb1fd802911fd8e