am 3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40"...
am 3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1
* commit '3f51f954':
Fix a crash caused by SIP addresses containing "%40" instead of "@"