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

Change-Id: Ibfa72beb9b1706d4d46a5b12b25f17ede9f8e435