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

Change-Id: Ie1e1d5fc0df3e6f9af9c4cb7980504b80e3675d9