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

Change-Id: Ic05fcd336e39f8c3f60ad9d3de0aa78a081aee0f