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

Change-Id: I15525d78f167cfd41e74ad66448118d5dafe8616