Integrate security patch 2022-09-05-CVE-2022-20399

Change-Id: Iebbc8a48f37e0f5a8313727c4ae3990ebbb6eb04
6 files changed