Cruise ships in Japan back on track with COVID safety measures