am 43a92646: Merge "Use native brige only if we have a private data directory."

* commit '43a9264619e08f464dd4f184e53441a440cca09f':
  Use native brige only if we have a private data directory.