Merge "Add dumpstate_test to presubmit"
am: d2690997a5

Change-Id: I951cc15ddbc2de1088654fcaa2fdfe1e20978b43