Merge "Remove auto-gen project.properties"