Merge "Add METADATA to nist-pkits: Apache2=NOTICE" am: 676706f8dc am: 80560f8de6 am: 912c38adae

Change-Id: Iee6dd8dd616dc804cbf156bdeb76274aab11fbaa