Merge "Update Radio and Sap service name in VTS." am: f7c337546a am: ff75143a7a
am: 0908df747d  -s ours

Change-Id: Idf43b6e46ca928156f88e30e102b28079a3e5e83