Merge "Add METADATA to neven: Apache2=NOTICE" am: 9444bc7e3b am: 9fbdbb4e33

Change-Id: Idaaeaaab3e397ec008e2bc4fa81f20b4a752e8e7