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

Change-Id: Ib38e276c00f793d2e3f881d4f3ce079ba58aa581