am e20891e4: Merge "Additional context for sip address types." into jb-mr2-dev

* commit 'e20891e4ccdbedc5af9cd94b2fc368dce43c96fb':
  Additional context for sip address types.