Merge cherrypicks of ['googleplex-android-review.googlesource.com/23809690', 'googleplex-android-review.googlesource.com/23862214', 'googleplex-android-review.googlesource.com/23862215'] into udc-release.

Change-Id: I4b825e085eaade884e929fec367cf2c07c824679