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

Change-Id: I3f5633da996140cf88d85e5f997d9e41d48dec45