Integrate security patch 2021-10-05-CVE-2020-26139

Change-Id: I399e4a655ff30d02b857c55ddbcb3f58d17058aa
4 files changed