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

Change-Id: I8cfe4e8d7998f787feb3c4db26f67c86a26a4e05