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

Change-Id: I3f59bd24615d8ae8ce5ebec8c257cf3eb77cf25a