Two separate 72 hour transits

1. We are flying from London to Shanghai Pu Dong direct and will be in Shanghai for approximately 54 hours and then leaving from Shanghai Pu Dong to Tokyo.

2. Two weeks later we will be flying from Singapore to Shanghai Pu Dong and will be in Shanghai for approximately 12 hours and then leaving from Shanghai Pu Dong to London (the return flight to London from 1. above).

Will both of these transits qualify for the 72 hour visa-free transit?

Many thanks