I would say... dont't take the risk to be honest. Esp. Tokyo. Osaka or further up in Hokkaido or down in Okinawa possibly still relatively better.
Myself bringing my girl to Hokkaido in less than 2 weeks time and will transit in Tokyo, for that I'm also a little worried.
Though people who have been to Tokyo and back will tell you it's entirely safe.