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

Change-Id: Ie39092aae4a1038e611a5cf7342ff973358faf17