Merge "Perfprofd: Fix service definition"