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

Change-Id: I082dd44b10ac964dba6c068495b2033d4c0e3833