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

Change-Id: I585b5726f75a376365d230e00a9ead2d2f82775a