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