Update extensions/EventLogging to master

Change-Id: I56cb60f2d9d4fb46b26c7d2c7f89b6a77f6d1a15