Merge "Fix dumpstate_test test config" am: 57bf6a993e am: 57e287f2e5 am: c2d52cf96b
am: c7267dbce7

Change-Id: I7d8eb15c58d77c3e92edcde57f883f627b85c4ac