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

Change-Id: I8ed91abcc079d061bd67089edbd9e781e911c235