Update EventLogging to master

Change-Id: I2712801b6287213dc3baac9f5da3671791ed13d4