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

Change-Id: I3babe37ec287dcd5c4f84dc319a7de70f322e2d5