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

Change-Id: Ib76f1150a782339a940bba5895df8d11e5b5ace4