Merge "Fix the gsi_tool cmd line progress" am: 9e040fc1f4

Change-Id: I490a3fb905503d21858211165f1600da34945e96