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

Change-Id: Ibd5ddff4a558201feb14b62187cd56316d34cc4f