Merge "diag: Remove invalid check for payload"