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

Change-Id: I1caf565e519d880a9f1afc92c6498f516a526a93