Merge proposals dependent on lp://qastaging/~kalebral-deactivatedaccount/randgen/update-drizzle-queries

1. update-drizzle-queries
2. Dependent merge proposals