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

Change-Id: I10b52ca6be07daaad6371841d7b4bd63786b0b26