Merge "Remove handoff references from telephony"