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

Change-Id: I9fcfd87915ab4160d16d6213425384cc982810ab