Merge "Override handleShellCommand() in NPMS."