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