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

Change-Id: I60ba4201d30f77b7820a2ea7586e4ca16e860d7e