Update CoreEvents to master

Change-Id: I0462e9006bd508c92688c5f07424184712394153