Merge "Move CriticalEventLog to its own package"