Merge "Remove redundant flag from dumpstate" am: a53145a647 am: ac672cd941 am: 4d1051308b
am: d159b1bb60

Change-Id: I72d247c0b27e6d2b86e2dde535510a23c54e0189