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

Change-Id: I0c7836905fa7d0e6ec84c60fbbb205fee50f6177