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