Merge "Add a Tag field to dist to dist a tagged output" into rvc-dev am: 84dc13b8 am: 1684879a am: ec337fb4 am: 1ecba23c Change-Id: I623144077eeea5f3666c10c396a045e6d20ea1df