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

Change-Id: Ia0d060476400bdd0a80f7599dc953419891269ff