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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23822907', 'googleplex-android-review.googlesource.com/23831003', 'googleplex-android-review.googlesource.com/23854042', 'googleplex-android-review.googlesource.com/23848628', 'googleplex-android-review.googlesource.com/23875866', 'googleplex-android-review.googlesource.com/23845585'] into udc-release.

Change-Id: Idd03aee5c8b649c2163154151faf6e60492354a3