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

Change-Id: I97652ddd8fc3fbc67676abb67db90210430c5abe