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