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

Change-Id: I4f987d31d0511f23d563e418971e397321369f90