Re-add Telephony

Change-Id: Ie41c05c6f14530459ccf607cc6c18630a78a61bb