Add version argument and output

Change-Id: I71c970c338297ada898fe5df887ecb975f7c3b29
Merge "Add version argument and output"