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

Change-Id: I6608e59c7ed0a5c73f4b6fbd9242380ebed007b3