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