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

Change-Id: I850d7e1e586d9549071b5837cee38c8f497283a4