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

* commit '919a2efeeff6c5ac0dc36883c84d13ed4ca6bce2':
  Fix deadlock in dispatcher. (DO NOT MERGE)