Merge "DO NOT MERGE Removed test for CVE-2016-8424" into oreo-cts-dev