Merge "Allow init to rm /dev/diag"