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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23382463', 'googleplex-android-review.googlesource.com/23728044', 'googleplex-android-review.googlesource.com/23768708', 'googleplex-android-review.googlesource.com/23883969', 'googleplex-android-review.googlesource.com/23794266', 'googleplex-android-review.googlesource.com/23905120', 'googleplex-android-review.googlesource.com/24102276', 'googleplex-android-review.googlesource.com/23987753', 'googleplex-android-review.googlesource.com/24101116', 'googleplex-android-review.googlesource.com/24031910', 'googleplex-android-review.googlesource.com/24081945', 'googleplex-android-review.googlesource.com/24058478'] into udc-release.

Change-Id: Iba1e379734b15c6ccd52497b6db403fd68df9fb3