Merge "Consume events in dispatcher tests" into rvc-dev am: 0716947dcb

Change-Id: Ida146ab2b5592da831120dc9212f98f6605ec48d