version: Fix code review issues

Change-Id: 5521f0add2