Merge "Use sleep_for for fsck timeout"