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

Change-Id: I50958c7dfe8fc1328d88ba54aee0240bd8c55042