Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev