Renamed dcVersion to Version and minor changes.

Change-Id: I008327f795fed884282032330a4d04365c8c9444