Merge "Fix failure vts tests:" into oc-dr1-dev