Merge "Update version code definitions"