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

Change-Id: Idf9b3499440449d5a440da9f1accbd5f10b47a3b