Merge "Update references to DebugEventReporter"