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

Change-Id: I60d1c2e159027092a914ae02f2bf687bd2866990