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

Change-Id: I6f5789a4f5ffd51085094a13ebe8c9ffe8f9c826