Merge "Simplify the exit conditions for dumpstate" am: ee7e30bc92
am: a319fb22fe

Change-Id: I22f8265dafd753550eda56001b744491879735d6