Merge "diag: Fix for diag debugfs buffer overflow"