Merge "Remove @hide symbols from NativeDaemonConnector"