Merge "Fix telephony build"
am: 542b99d8ac

Change-Id: If44f1e70cdc71ae01c34faaa99cbc2e88427e1f5