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

Change-Id: I7a5fdc2944593d98bb67eeae8d0635fa98d04e71