Merge "Added system property (dumpstate.unroot)."