Merge "Fix dumpstate smoke test" am: 917b4d4392
am: 48ea00fbd7

Change-Id: I061d6de05d9f55be44b4def11ac5729b96d573a9