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

Change-Id: If79e99ffb44408eca183b6bd7a380e6b9a006668