Integrate security patch 2022-03-05-CVE-2021-39698

Change-Id: Ie44598cf89ae5f5e20e1e806eb76555b029eb946
6 files changed