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

Change-Id: I850a388dc4f365d7d694a82c2a0c820322299292