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

Change-Id: I3e6c0087a72b8da7b804d186cb52b8ff58fd133c