Merge "Fix emergencyDial tests in VTS 1.6" into sc-dev