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

Change-Id: I5e8b6f6f29c038ff5444e538545945b90489cc7e