Optionally store Events in Collector

Change-Id: Id4687e075e04278d1db6e8acc805c3fed2bd07bb