Merge "Fix incorrect FIFO cgroup assignment."