Integrate security patch 2022-03-05-CVE-2021-39685

Change-Id: I709b66c36a5b864ce598fa62bd462b581152d5d0
3 files changed