Merge "Remove /dev/diag node on user builds."