Merge "Modify the build version to match changeId stuff"