Merge "diag: Add generic diag interface"