Merge "Update Radio and Sap service name in VTS." am: f7c337546a
am: ff75143a7a

Change-Id: I76b9a4c0b1fde16109d5209254060204381ec1dc