Merge proposals dependent on lp://staging/~veebers/autopilot/fix_1178014

lp://staging/~veebers/autopilot/fix_1178014 has no merge proposals.