am ea93d815: (-s ours) am c06c5c1a: Do not merge: Telephony: Fix config to...
am ea93d815: (-s ours) am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type.
* commit 'ea93d815':
Do not merge: Telephony: Fix config to reflect the correct CM conn type.