Merge "DRM vts test bug fixes" into oc-dev