am 5c357cdc: Merge "Correctly match SIP addresses." into ics-mr1

* commit '5c357cdc621aa2b59c4c9b9969540af88fe15277':
  Correctly match SIP addresses.