Merge "Add code to maintain a session for phone calls"