Merge "Fix emergencyDial_1_6_withServices in VTS 1.6"