Merge "Remove deadlock between Telecom and Telephony"