Merge cherrypicks of ['googleplex-android-review.googlesource.com/28712471', 'googleplex-android-review.googlesource.com/28712472', 'googleplex-android-review.googlesource.com/28712473', 'googleplex-android-review.googlesource.com/28724994', 'googleplex-android-review.googlesource.com/28724995', 'googleplex-android-review.googlesource.com/28724996'] into udc-platform-release.

Change-Id: Ib007f5c8a8a3dc20b6fac6b542346331b9a2556c