Merge "[RESTRICT AUTOMERGE]Removed test for CVE-2015-8839" into nyc-dev