Merge "Remove redundant flag from dumpstate" am: a53145a647
am: ac672cd941

Change-Id: Ia0a7086aa3ab72245cf743c10a5ca7267e7e1b62