Merge cherrypicks of ['googleplex-android-review.googlesource.com/24408134', 'googleplex-android-review.googlesource.com/24408135', 'googleplex-android-review.googlesource.com/24425794', 'googleplex-android-review.googlesource.com/24426007', 'googleplex-android-review.googlesource.com/24213444'] into udc-release.

Change-Id: I526115aa205794685251041cbb7ad8d334911c0f