Merge "Fix failing telephony tests" into sc-dev