Merge "Correct Telephony source directory to match package."