Update EventLogging to master

Change-Id: I06259343846d9c19778d957bae831c221f545c15