Integrate security patch 2023-05-05-CVE-2023-21666

Change-Id: Ic1d3ed9d6e9e221a4167103869d9171843841705
(cherry picked from commit 0c2393ad78868accfa3a35fad95d6dd54dcb0f4f)
1 file changed