Update EventLogging to master

Change-Id: I5521ba7474f2b3d574b2045012a34971d1095e13