Merge "Revert "Handle radio API in low version VTS for high version service"" into pi-dev