Update EventLogging to master

Change-Id: I8939fb6a67c16b83c66f7638de1feb7bf6b62df1
Merge "Update EventLogging to master" into wmf/1.22wmf3