Merge "Fix VTS test which turns off radio. am: 71620817a9  -s ours am: 0cc426f287  -s ours" into oc-mr1-dev