Merge "Add module for nist-sip" am: 1e9c4ab2cd am: a6844ac622
am: aed544ddba

Change-Id: I7af15110a0321ba9525e5360b47e557809ce9da6