Merge "[RESTRICT AUTOMERGE]: STS test fix for CVE-2018-11261" into oc-mr1-dev