Integrate security patch 2022-05-05-CVE-2022-0847

Change-Id: Ib71a200cdf2bf5ca6b75500b557a9784b6a7841b
1 file changed