Adding event tasks

Change-Id: I212e6c535fc0b8680e672d6041c214af30e26b1a