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

Change-Id: Ifd01ff9f4782c9535a325cc1475465a794884fd0