Update CoreEvents to master

Change-Id: I4aa1d1aedeb4175c24128468a0a8c14e8c97bcbf