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

Change-Id: I0ef86c61206c4d622652f6946463bebcde490961