144 hour visa exemption

Hi. Will my trip qualify for the visa exemption? I will fly into Beijing from the US with a layover in Japan and stay in Beijing for five days. I will have a layover in Shanghai on the way back from Beijing to the US. My trips will look like this:

Way there:
US - Japan - Beijing

Way back:
Beijing - Shanghai - US