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

Change-Id: I3fa15f13b735bced8f982d1eae05f658b40063e5