Merge "Add METADATA to common: Apache2=NOTICE" am: 38b61659e3 am: a11ccda1c9 am: 34e381ed70

Change-Id: I2339273a8edd235c32c0ddd3f037f78568711400