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

Change-Id: Ibfd2224e00e813d90ece4174dce3e2c1a25f9da9