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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23845784', 'googleplex-android-review.googlesource.com/23694643', 'googleplex-android-review.googlesource.com/23833763', 'googleplex-android-review.googlesource.com/23822674', 'googleplex-android-review.googlesource.com/23841140', 'googleplex-android-review.googlesource.com/23846528', 'googleplex-android-review.googlesource.com/23824651', 'googleplex-android-review.googlesource.com/23846298', 'googleplex-android-review.googlesource.com/23761845', 'googleplex-android-review.googlesource.com/23831344', 'googleplex-android-review.googlesource.com/23589157', 'googleplex-android-review.googlesource.com/23844590'] into udc-release.

Change-Id: I18810c58b0965180abde8af92e7b6338b43e728f