Merge "Fix dumpstate_test test config"
am: 57bf6a993e

Change-Id: I5334d014166cf292752c509bbb81d6ca637bac02