Merge "Update Radio and Sap service name in VTS." into oc-dev am: 382cb1bdb5
am: 06c76b2f07

Change-Id: I03e72c55bff68cc6fd1328f70cbb62f5043180b2