Update EventLogging to master

Change-Id: I8282df97a9f2afcbcf0db66334e4e64fb2170633