Merge "Add dumpstate_test to presubmit"