Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev)  Prevent FIFO threads from creating more FIFO threads." into nyc-dr1-dev
am: 051d6b74eb  -s ours

Change-Id: I790f9bb052f72c89e84fc1b41942a1707cdc43e4