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