Update EventLogging to master

Change-Id: I5b1da9b136941b54ca30c2a685cfc33ff1a77876