Merge "Add dumpstate_test to presubmit" am: d2690997a5
am: 111aa6b4ec

Change-Id: I1d75325048aab2c5ef981f31bb77b681bb43b445