Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1