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

Change-Id: Ife486e868385018a52fe50102f40d09037763f4d