Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev