Update EventLogging to master

Change-Id: Ia4d463505c6ab9b0fd0af54a6fc4c474de004882