Merge proposals dependent on lp://qastaging/whoopsie

lp://qastaging/whoopsie has no merge proposals.