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