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

Change-Id: I7f42fe8e8be5ea97515d428ad3fcba902c0652a5