Merge "Omx vts test." into oc-dev