Update EventLogging to master

Change-Id: I3a8348455df909179f19c018e10ae31b48fca8db