DO NOT MERGE ANYWHERE (nyc-dr1-dev)  Prevent FIFO threads from creating more FIFO threads.
am: d72b26085c  -s ours

Change-Id: I8676c789e957407268a38c1d0958479f3026fe24