Merge cherrypicks of ['googleplex-android-review.googlesource.com/23782841', 'googleplex-android-review.googlesource.com/23850143'] into udc-release.

Change-Id: I40f6df67704e7323d41dcb64894ab816491f452d