Update CoreEvents to master

Change-Id: Iebe468175fffdb9103a5e6c6cd43557da29cb472