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

Change-Id: I308d1dcce0db8b037742e48fcfe57c1c2f2bdd87