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

Change-Id: I0c3e0f832e845fb988cf30dd75810ac7739329aa