Merge "Fix VTS test which turns off radio." into oc-mr1-dev