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

Change-Id: Id21bf6e6a46c91979cb21f146890a7c55e38fae3