Update EventLogging to master

Change-Id: Id1beb6393869b551eb2c4aff0bc2bf61b663cc1c