Merge "Fix telephony build"