Merge "reboot: only run fsck when detecting filesystem inconsistency"