Update EventLogging extension to master

Change-Id: I1c9b4ba547e3a66b10ec08b9720811c99f52754a