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

Change-Id: I25aad150022b02a0d67d9bd463a9e6ebf4e27dbc