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

Change-Id: Ic575a6db407a8cfbc2d5c7bf2938e6e03829e3b0