Merge commit '9a430d8c0e376160f287e50cdad99177e69ec384' * commit '9a430d8c0e376160f287e50cdad99177e69ec384': allow dumpstate to work for non-root users.
Merge commit '9a430d8c0e376160f287e50cdad99177e69ec384' * commit '9a430d8c0e376160f287e50cdad99177e69ec384': allow dumpstate to work for non-root users.