Merge "Add METADATA to nist-sip: contains Apache2=NOTICE" am: 54222ef2ef am: 4c5b69a587 am: 10d85dd5f8

Change-Id: I93c7a2ec95b64e00be768a22160a486a74ce6203