Update EventLogging to master

Change-Id: Ibb87d6014cca4cc759d90b764b0a1c032e075728