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

Change-Id: Ifefa6876828e11f3fbfa3da24e654438baa179d0