Transit Visa in Guangzhou for an Australian

Hello
I am an Australian passport holder. I'll be flying from Vietnam, land in Guangzhou at 1:00 and fly out at 10:00. The flt from Guangzhou will stop at Beijing for about 3 Hours (13:30 - 15:50) before heading off to Vancouver in Canada.
I have no plan to leave the transit areas of Guangzhou and Beijing airports.
Does the 24H free transit policy applies?
Do I need to apply for a transit Visa?
I know I cannot have the 72H transit Visa because the flt from GZ stops in BJ.

Your reply is much appreciated.
Ta