Merge "remove /dev/diag node"