Japan upgrades forecast, says economy has bottomed out