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

Change-Id: I9d5e4309169f480c3d4392c794605608dbe8ab11