Merge "Split dumpstate's execution into shorter functions" am: 1f4bf70497
am: 7be3e467ef

Change-Id: I34298d889721fc746e2516e18d90ddf277bc1f42