Integrate security patch 2022-06-05-CVE-2022-20132

Change-Id: I63614dce5de6ba3465b531c71e8e37af1c3517e8
24 files changed