Merge "More pre/postsubmit tests to dumpstate"