Update EventLogging to master

Change-Id: I1d1a5ce35439c11737fcef8ed657db12a7c8607e