Merge "Fix dumpstate smoke test"
am: 917b4d4392

Change-Id: Idaaf794a1a5bc487cee938c11ee913c147f0ac1a