Fix deadlock in dispatcher. (DO NOT MERGE)

This regression was caused due to a bad cherry-pick / merge.

Change-Id: I79e84285bbfd4cd4b66681461543fb185b60d3ba
1 file changed