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

Change-Id: Id662664a709da30b89b28b9579a5e3159e6b29f2