Integrate-security-patch-2021-07-05-CVE-2021-1955

Change-Id: Id5d8ae551f62b3cb71beb4d1c9bb2b4dd97801ea
3 files changed