Merge "Remove ScopedLogSeverity for debugging"