Merge "Refactor options parsing in dumpstate" am: 22c321c715
am: 81e546fdf5

Change-Id: If88861f4c14b107b0a8f20cbb783145df0c51f33