Merge "[RESTRICT AUTOMERGE]: STS set testPocCVE_2017_0589 to high-memory" into oc-dev am: fc3b46e58f am: 53d6f15c00

Change-Id: I726445ce73970e8c14e74b8b3d110e345a642f54