Ensure version column is correctly incremented

Change-Id: Ie748e03c430304f7aa797fc3c79cfca851f68aee
Closes-Bug: 1385300