Merge "Prevent FIFO threads from creating more FIFO threads." into nyc-mr1-dev am: bb4e37c602
am: 6e23e43d54

Change-Id: Ibe675c0aebe95273ff12e2833b6668e0d3bc4bfa