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

Change-Id: I185ac873bc8a57bad2ba94e0c9ab23467f71b962