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