Merge "[RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-6789" into nyc-dev