Merge proposals dependent on lp:~thomir-deactivatedaccount/autopilot/fix-pick-variant

lp:~thomir-deactivatedaccount/autopilot/fix-pick-variant has no merge proposals.