Merge "Revise code of gsi_util help" am: 65f8b7218a am: 94e4dfe050
am: f2aef61ff7

Change-Id: I947b59ea300b2a8abe11a69a17217188ee0026d4