Drizzle

Merge proposals dependent on lp://qastaging/~derks/drizzle/refactor-pandora-plugin

  1. refactor-pandora-plugin
  2. Dependent merge proposals

lp://qastaging/~derks/drizzle/refactor-pandora-plugin has no merge proposals.