Merge cherrypicks of [17265115] into security-aosp-rvc-release.

Change-Id: I51148fb15e58269090fb0fce3970d53f76ffe326