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