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

Change-Id: I1ae606cc5e0cfdc717843c5ba1b015f0aa17a5ee