Merge "STS set testPocCVE_2015_1805 to high-memory" into oc-dev am: b332ebcb am: af078d2c am: 956807e1 am: 1893d5f5 am: 0c5249d3 Change-Id: I507193e36e692e03c3b2a76678290df4bc8a3438