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

Change-Id: I28fd089405fb73d7aeeb23711ee1a4d3ede29709