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