Update EventLogging to master

Change-Id: I6b0b72887a961d955062e4dd2953a8a0c86f6715