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

Change-Id: Ie97dd6344450e3e008bbce10abaad5d66c1c55a0