Merge "Add shell command to support GTS"
am: 5b58ce4acc

Change-Id: I7f3a0267efb52394105f0895f5cfd2cb1ef085ff