Update EventLogging to master

Change-Id: I8252d2afd1152c1e1fd9d2ecbc585af3ef20803e