Update EventLogging to master

Change-Id: I025a6675c07da651c17658aaf05a40b9be7c5670