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

Change-Id: I732f17862cdfbb67f1225d55c81a0ceb3b0f5503
6 files changed