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

Change-Id: I0d2e403d407cfd56dc0dabf63162d75f7328ede4