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

Change-Id: I266856ecb22440f3732f2264a61cf52270740769