Merge cherrypicks of ['googleplex-android-review.googlesource.com/24697846', 'googleplex-android-review.googlesource.com/24698949', 'googleplex-android-review.googlesource.com/25175438', 'googleplex-android-review.googlesource.com/25175439'] into udc-release.

Change-Id: I854d20e212078d656b0b3c229f534bf0a9da1252