Merge "Revert "Add cpu controller into task_profiles.json""