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