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

Change-Id: I68dd84ebd1c1976f00a24bc2a8cfae81005b04d8