Merge "Fix vts hal tests" into oc-dev