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

Change-Id: If51ef3d304930644f69da755bd05950bfd9209c9