Merge "Allow Shell to have permission for CTS." into tm-dev