Merge "Revert "Hold a wakelock during dumpstate."" into cw-f-dev