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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23877262', 'googleplex-android-review.googlesource.com/23875484', 'googleplex-android-review.googlesource.com/23907042', 'googleplex-android-review.googlesource.com/23912844'] into udc-release.

Change-Id: I6de57a74166f0c5b04cb2d2b908f9a4150a74b0f