Merge cherrypicks of ['googleplex-android-review.googlesource.com/25170842'] into udc-d1-release.

Change-Id: I1f043a07c086ea13a115a12fe4b734f50e945545