Japan to lift COVID border controls in October