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

Change-Id: I5d1b0a08b8d3eca8d3156eeb1bec33c5576c737a