Merge "Fix VTS CTS-on-GSI missing vts" into oc-dev