Merge "CVE-2019-16276 Vulnerability fix."