Cruise ships in Japan back on track with COVID-19 safety measures