Update EventLogging to master

Change-Id: Ia8d7e2b50a363e2573a8c9860ee11edb1c232bab