Merge "Add METADATA to extras: Apache2+BSD+CC-BY-NC-SA=NOTICE" am: f92c99c202

Change-Id: I4a9aff69e418e3df1b0195f10472b0e761d27e36