Merge cherrypicks of ['googleplex-android-review.googlesource.com/39524648'] into 26Q2-release. Change-Id: I00667019d702a454bc2ad4227f41b11086950f05