144 hour Visa Question (shanghai)

I plan on having a flight plan of
Los Angeles -> Hong Kong (Layover) -> Shanghai (72 hours) -> Tokyo -> Shanghai (10 hours) -> Hong Kong (layover) -> Los Angeles

Does anyone know if this is valid use of 144 hour visa free travel?

I am worried because on this site it says: "Key point: The international flights flying in and out of China – from A to B and from B to C – should be non-stop, without a stopover anywhere in Mainland China"