am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"

* commit '9204644d9e8fc2a3d05ff386b14b349f7a117694':
  Fix a race condition in NativeDaemonConnector