am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2

* commit '5665770bc4449a96f2365bec71fb012ca2e7bc81':
  Fix deadlock in dispatcher. (DO NOT MERGE)