Merge proposals dependent on lp://staging/~kissiel/checkbox/autopilot-fix

lp://staging/~kissiel/checkbox/autopilot-fix has no merge proposals.