Merge "dumpstate: remove obsolete TODO" am: 81c1bf02a8 am: c754cfcdc7
am: 987a019c57

Change-Id: I137ecf91caaf405e17316920148cfead51c560f1