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

Change-Id: I6d293602de7290d1f909794358b3d221135f79f8