Merge "Add shell commands and other support for host CTS"