Merge changes from topic 'fix-vts-test' into oc-dev

* changes:
  update .hal file to fix vts test
  Fix vts tests