Update EventLogging to master

Change-Id: I75eafda5daad20d49c555d3fabaec71055ddc9ae
Merge "Update EventLogging to master" into wmf/1.21wmf6