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

Change-Id: I0cdb3efc658328fc39c90136813865536d341306