Merge "Add option to #define _DUMPSTATE_DRY_RUN_ to skip the actual dumps."