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

Change-Id: I762d28acbe7d8f8409692f6b932f81d2ff5046a6