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

* commit 'bb756a90902ade5cf619f5fa65ec5505dcdf431a':
  Fix a race condition in NativeDaemonConnector