Fixing telephony

Change-Id: I3165a6f4505614b1ebf7a0b9739faa0adc111115