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

Change-Id: If49e8667cc1b02e1a3450213585a99c0a5b04746