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