Merge "dumpstate: remove obsolete TODO"
am: 81c1bf02a8

Change-Id: I0c98b92ce87bbde4d8814621a53e3b417c6cdc21