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