Japan raises view on demand, but says economy in severe situation