Update EventLogging to master

Change-Id: Iebff45882755a23d5b810d552544f44ac5b03fef
Merge "Update EventLogging to master" into wmf/1.21wmf8