Merge cherrypicks of ['ag/20614047'] into security-aosp-rvc-release.

Change-Id: Id4f297da2b6cd30799240b38d59a9e18bf8de5ee