CB-5504: Moving Telephony Logic out of Device