Merge "Change SipMessage API name"