Merge "Added system property (dumpstate.unroot)." am: 4c2a2ba8e2
am: dc1c033e2d

Change-Id: Id3ae532ecf5703ef56b4261cfd503de24e9a4dbd