Merge "Add permission to shell for CTS test"