Merge "Remove the versionCode"