Merge cherrypicks of ['googleplex-android-review.googlesource.com/23827541', 'googleplex-android-review.googlesource.com/23828045', 'googleplex-android-review.googlesource.com/23851392'] into udc-release.

Change-Id: I30acef7b58d5aa7fa03db1662259923d5da45c6a