Merge "Fix vts tests:" into oc-dev
am: 14b34e19d6

Change-Id: Ib2f1a77ece04254a73cdd69c9a46206593c5d4a9