Merge "Revert "Remove unused project.""