Merge "dumpstate_test: Minor tweak to comments" am: fa7652f29c am: aa5e44f648 am: 9c1dc3fd83
am: e3426d3016

Change-Id: I0e0028191758df01f0e0631ecd77baccfc8a8166