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

Change-Id: Ie0c072dcbac9a56173c68e14bbe2e7eb1510cf85