Update CoreEvents to master

Change-Id: I5dd82fe26c688ad26537ea0050d1db210458bc4e