Merge "Fix the gsi_tool cmd line progress"