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

Change-Id: Ic70fd66334c03f6738d8c5a035a54ea5172692e0