Merge cherrypicks of ['ag/20615111'] into security-aosp-rvc-release. Change-Id: I656251b2cf96a500c1a6e47b5be222890475ee32