Integrate security patch 2023-07-05-CVE-2022-42703

Change-Id: Iaeb87947aec08155442fd8c45ad09df8a90a4af1
(cherry picked from commit 15347a15e3a86941cdc80849c430c88d1bef2927)
3 files changed