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

Change-Id: Ic994a3d120510422bc6a1b096e951ac03ca72c0e