Merge changes from topic "am-c310f9b4-18a7-4504-8179-49be1ab1d4a7" into oc-mr1-dev

* changes:
  [automerger] Fix VTS test which turns off radio. am: 71620817a9  -s ours am: 986facc698 am: 379ad11204
  [automerger] Fix VTS test which turns off radio. am: 71620817a9  -s ours am: 986facc698
  Fix VTS test which turns off radio. am: 71620817a9  -s ours