Merge "Add NativeDaemonConnector users to watchdog."