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

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