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

Change-Id: Ib6a70cf5af1ea0affe3cf1bd274ba0c7463c776f