Update EventLogging to master

Change-Id: Ibb871ca560e9e666cdd9b7a0f57858189b123ff0
Merge "Update EventLogging to master" into wmf/1.21wmf11