Merge "Correctly match SIP addresses." into ics-mr1