Transiting through 2 China airports

My flight from Sydney to Tashkent + Astana will have stopovers in Guangzhou and Urumqi.
1) Arrive in Guangzhou at 05:30 on 5 August, fly from there to Urumqi, leave Urumqi on flight to Tashkent at 21:10 on 5 August. Does this qualify for the free 24 hours transit via China?
2) Arrive from Astana to Urumqi at 14:40 on 27 August. Fly from there to Guangzhou. Leave Guangzhou for Sydney at 08:25 28 August. Though it is on the next day, the international dept. flight from Guangzhou is within 24 hours of arriving in China in Urumqi. Does this qualify for the free 24 hours transit via China?
Regards,
Helena (Australian passport)