Merge "STS set testPocCVE_2015_1805 to high-memory" into oc-dev am: b332ebcb am: af078d2c am: 956807e1 Change-Id: Ic05fcd336e39f8c3f60ad9d3de0aa78a081aee0f
mentioned in commit 0c5249d3
mentioned in commit 8c2d594e