Merge cherrypicks of ['googleplex-android-review.googlesource.com/39870592'] into 26Q2-release.

Change-Id: Icd14beb2a5c26d6b976e3cffe4c19378d537fba2