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

Change-Id: Id2f13f18793e0a6b6c00368be8cf2de6cf329092