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

Change-Id: I524146b0a74f6c69dc07fe4fdc8a3380578289bf