Merge "Fix more radio VTS test." into oc-dev