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

Change-Id: I78b8ca1e8a5518a473e8ca3ca2cfcbd682f1d400