Merge "Add a flag that makes dumpstate wait for options"
am: f1d9a288bc

Change-Id: I3254e8c5fd52c6f1a750ade6d859538653bd090d