Merge "Fix more radio VTS test." into oc-dev
am: 3cc7c4e314

Change-Id: Id8f41004922cfb7d5622e2a20aa0c7569a46efbe