Merge "Fix dumpstate test instructions" am: 0285d41e08
am: 685995dcd9

Change-Id: I13f07fb1249033b7ebd440a9fc70242d06683234