I have stayed at the Tokyo Edition multiple times. I have always received a suite upgrade, except once where I was asked if I wanted a room with a terrace as booked, or a suite without a terrace.
Always 4pm check out. And always a nice welcome amenity. Plus of course the policy driven 1,000 points.