Update EventLogging to master

Change-Id: I2ed0bd521aafd62b083d0adb67bc3cdc5f461d0b