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

Change-Id: Icfcf4010fa82e60a6562431f3102e0c3d94b8a2b