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

Change-Id: I2ed3d800cf58526e1a0b9584092fbe025d367720