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