Fix EventLogging fail

Change-Id: I220c06211e6b43d144523311d571cf1098cb74ed
Merge "Fix EventLogging fail" into production