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

Change-Id: I4093c54163fede6ef66747f494ae1fca3c26ab85