Integrate security patch 2023-05-05-CVE-2023-21665

Change-Id: I00e344515f2c47bdc60dced952120e5d73bd9e9e
(cherry picked from commit 2c68153c8c8f5f6289ef9b52e5aae6fd9db68364)
1 file changed