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

Change-Id: Ic0216f28d9ea98c74ad7146258117fb60d260939