Merge "Telecom, Telephony share a process." into lmp-mr1-dev