Merge change 9594

* changes:
  init: add permissions for /dev/diag and /dev/diag_arm9