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

Change-Id: I2c676fd849b1a18c0dfe6a46fd2ef35067643d64