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

Change-Id: Ic9b6042003d1a3a95c410bf7380e91ed014c14cb