Merge proposals dependent on lp:~veebers/autopilot/fix_too_many_vids_1189655

lp:~veebers/autopilot/fix_too_many_vids_1189655 has no merge proposals.