Just returned from Tokyo and wanted to post info since it wasn't 100% clear when I was going through it. Wife and I are not fully vaccinated, so we went to Walgreen's to get tested. The Rapid NAAT (results < 2 hours) worked. We uploaded our test results as part of the Fast Track process and they were accepted.