Merge cherrypicks of ['googleplex-android-review.googlesource.com/23909000', 'googleplex-android-review.googlesource.com/23923806', 'googleplex-android-review.googlesource.com/23920481'] into udc-release.

Change-Id: I8ff9da2a0d21330d22a61bd9d4a566854f935d4a