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

Change-Id: Iebe940f06152593eb75e91499e8d614fc4257671