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

Change-Id: I1b8242ab6d44927dbf8b2ed6f109fa3a1b8e7e6a