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

Change-Id: I45ae6a47edadcb286b8260839139b62131cbe303