TWOV question

I am planning on visiting China (8 days total) but am making stops in Japan first. Do I still need a Visa because I am not transiting somewhere else after China?

LAX > Tokyo > Kyoto > Osaka > Beijing > Xi’an > HK > LAX