Fix ref to undefined variable in dispatch changes

Change-Id: Ib21c625941a3a6e35e0a0da4bae11a95e90a846e
Merge "Fix ref to undefined variable in dispatch changes"