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

Change-Id: Ia30c52b1d7acaf21569c7906ce9d185b2ec77e87