am b3615721: Merge "Allow init to rm /dev/diag"

* commit 'b361572153bb7ac48a64af185fc4521d8139a8dc':
  Allow init to rm /dev/diag