Merge "Fix the SipPhone codes related to the ITelephone interface change."