Merge "STS set testPocCVE_2015_1805 to high-memory" into oc-dev am: b332ebcb43 am: af078d2c06 am: 956807e153 am: 1893d5f524 am: 0c5249d3b4

Change-Id: I507193e36e692e03c3b2a76678290df4bc8a3438