Merge "Revert "Copy functionality into calling location from Telephony.""