Merge "Add a Tag field to dist to dist a tagged output" into rvc-dev am: 84dc13b8 am: d2689082 am: 56bc3190 Change-Id: If5982ca5b0b9af5d239196839141768920ed3b60