Merge "Fix build because of addition of new Radio API to VTS."