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

Change-Id: I48a2a99e682a879e9844417c28515efffa589612