Integrate security patch 2022-05-05-CVE-2021-22600

Change-Id: I679a8ffe4f012a0167935b6db9f5555bad9dcd5c
1 file changed