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

Change-Id: Ic090ce9884de1a69ddb7a334acadfeb35ae9e2e8