Merge "Replace hardcoded cgroup paths"