Merge "Add functions for testability to the EventLog APIs"