Merge "Extend wait time for update_drivetrain job"