Merge "Fix dumpstate tests" am: 714761d2bd
am: 03c10ffd67

Change-Id: I99eedb0000e7d546fc73b3f5b7d0bbb4cf7df755