Merge cherrypicks of ['googleplex-android-review.googlesource.com/23710185',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23710185', 'googleplex-android-review.googlesource.com/23817530', 'googleplex-android-review.googlesource.com/23816915', 'googleplex-android-review.googlesource.com/23753323', 'googleplex-android-review.googlesource.com/23810723', 'googleplex-android-review.googlesource.com/23817723'] into udc-release.

Change-Id: Ife2ace81858a4d497d6b1aae01e1cab3625b04e5