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

Change-Id: I14561f3baf1ea8abe02f681bb198ecdbc6dd4ea6