Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev