bfa876c3a1
CVE-2020-11978 + CVE-2020-13927 Merge branch 'land-18283' into upstream-master
CVE-2020-11978 + CVE-2020-13927 Merge branch 'land-18283' into upstream-master