Come from waiver country but holding non-waiver passport

Hi,
Im holding Indonesian passport but will depart from Australia to transit in Guangzhou for 6 hours, then depart to Europe. Same thing when I fly back from Europe to Australia, I will need to transit in Guangzhou for few hours. Do I need visa for this?

Thank you!