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

Change-Id: I20b6989131358a596810ae6834845dea6885ede3