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

Change-Id: I056b934c8658867653a3fb65eb7d26edeb508c87