Update CoreEvents to master

Change-Id: I6715f3cc0d79cdeeeab690f34784e074e93f8e18