Merge "Revert "Update path for BasicShellCommandHandler""