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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23692527', 'googleplex-android-review.googlesource.com/23831186', 'googleplex-android-review.googlesource.com/23765836', 'googleplex-android-review.googlesource.com/23769422', 'googleplex-android-review.googlesource.com/23771395', 'googleplex-android-review.googlesource.com/23785932'] into udc-release.

Change-Id: I29406b4bf9a7f9a6753445598ecf1e41f8d66fc2