Merge "Fix dumpstate test instructions"
am: 0285d41e08

Change-Id: Ia1e08c286012768b4621319f7bcd744882e88297