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

Change-Id: I9f0119aedc620ed783d7da385d1ecad9a28ca168