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

Change-Id: I7f646924e4427dbbd19dbccd649caa3dd75f6e55