Merge "Fix version.properties"