Merge cherrypicks of ['googleplex-android-review.googlesource.com/23726247'] into udc-release.

Change-Id: Ibc906c14827b8b212d66311c149ac4fb9f1e2895