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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24077619', 'googleplex-android-review.googlesource.com/24130084', 'googleplex-android-review.googlesource.com/24147764', 'googleplex-android-review.googlesource.com/24133051', 'googleplex-android-review.googlesource.com/24134363', 'googleplex-android-review.googlesource.com/24133208', 'googleplex-android-review.googlesource.com/24157194'] into udc-release.

Change-Id: I1be7d1e10152d41939c84275b50ceb94b41c6b25