Merge "[RESTRICT AUTOMERGE]: Revert "Revert "[RESTRICT AUTOMERGE]: STS test fix for Android Security CVE-2017-0727""" into nyc-dev