Update EventLogging to master

Change-Id: I930acf10b6eb78c1cc0c90c92f21ef19eda6a652