Merge "Boost priority of short-running SF FIFO threads slightly." into nyc-mr1-dev am: 4df766b00a am: 6c6b395e97
am: 25b0e3e058

Change-Id: Ieae24b91039612f6b119ea555b0d612eefe88f14