Merge cherrypicks of ['googleplex-android-review.googlesource.com/37771421', 'googleplex-android-review.googlesource.com/37771422', 'googleplex-android-review.googlesource.com/37771423', 'googleplex-android-review.googlesource.com/37771424', 'googleplex-android-review.googlesource.com/37771425', 'googleplex-android-review.googlesource.com/37771426'] into udc-platform-release.

Change-Id: I25153295cd735609f302492dd981d8640e8577e3