Merge "Omx vts tests." into oc-dev