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

Change-Id: I85a785e41618b721e6db0c7d471f66073888b360