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

Change-Id: I3450cf48977c4d12acd9f77dea52fdf26147614f