Merge cherrypicks of ['googleplex-android-review.googlesource.com/24055429'] into udc-release. Change-Id: I918f51c4d44f706e7139bed9310bb6e564c777d0