Merge "API changes to Telephony per API review"