Merge "Update Radio and Sap service name in VTS." into oc-dev