Merge "Fix VTS test which turns off radio." into oc-mr1-dev
am: 6fb8b93bb4

Change-Id: I76f1dcd265828a7cceec5855ae0e9328895488c8