Merge "Remove redundant flag from dumpstate"
am: a53145a647

Change-Id: Ia26e073bbda39980d9629b5259832617e506b2f1