Merge "Add METADATA to tagsoup: Apache2+AFL=NOTICE" am: 2d5a010e59 am: 8d79f4b5de am: 8656ca77e3 am: f392ed6872

Change-Id: Ic2be2b3c1de702b208fe1bf8988cd7612013aa02