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