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

Change-Id: I0048612aaf183f2c59bd39c7bdb23ac591b38b40