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

Change-Id: I9775fe5eca0c1cca44ba5feb3e8fed2468a39161