am c6a47e98: Merge "Fix a race condition in NativeDaemonConnector"

* commit 'c6a47e98717df6980abc56c93a0dcc83c71f9d96':
  Fix a race condition in NativeDaemonConnector
tree: 2790c3c4d41a5fb07176231b4b77c13938212373
  1. core/
  2. services/