Merge proposals dependent on lp://qastaging/~brianaker/drizzle/factor-thread-specific

lp://qastaging/~brianaker/drizzle/factor-thread-specific has no merge proposals.