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

Change-Id: I56b5d41e29cf594014d8da85b4d928d2fd427610