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

Change-Id: I7de6c62a3b9d9f3a6dfca9d9edfae29bd5ef58df