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

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