Merge "Use native brige only if we have a private data directory."