Integrate security patch 2023-04-05-CVE-2023-20941

Change-Id: I4720a2c98326a10ead30d8ccca130b474da69653
(cherry picked from commit 02c735ed248b62fe72deb77fa798915e12ffb06d)
2 files changed