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

Change-Id: Iea2f53fb8a62d3c59a10ca352a8485cd4d0ee326