Merge proposals dependent on lp://qastaging/griffith

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