Merge "Revert "Use the new NativeDaemonConnector style.""