Update EventLogging to master

Change-Id: I496d03e65ef33e30adfdb423761d1daf3285a4d4