Update EventLogging to master

Change-Id: I055cfaf25d3713278b60ff449e963e30fc0b8c3d