Cherry pick CVE-2021-33833
Cherry picking CVE-2021-33833 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-33833
While here, remove patches that are unneeded to clean up the tree.
Cherry picking CVE-2021-33833 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-33833
While here, remove patches that are unneeded to clean up the tree.