Fix multi-threaded problem - two completion threads.

Change-Id: I356b276d50524c2192656a231b71235550bdec01
Merge "Fix multi-threaded problem - two completion threads."