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