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

Change-Id: I63c6b52c4b9ac567551affe845310cb4671e169b