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

Change-Id: Ic3af98080bc05f94e0bb78929a09b1ce392d6407