am 68a9f6d3: Merge "Allow init to rm /dev/diag"

* commit '68a9f6d3e326a80bd70efe8844cf1d18f2132052':
  Allow init to rm /dev/diag