Integrate security patch 2022-05-05-CVE-2022-20009

Change-Id: Ic6c9ab45bd42d190ef38d791e5fca664ab02f49e
2 files changed