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

Change-Id: If7f996b43073574763f9f762aa3bcb6c8a3f4e28