Merge change 24762 into eclair

* changes:
  dumpstate: Switch back to running as non-root