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