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

Change-Id: I26c25145d1431cf36f9e1906dce3db38220e1bee