Do I need transit visa in Guangzhou? I will travel to San Francisco.

Layover in Guangzhou for 16 hours and 11 hours on way back (itinerary below)

1. CZ 3038 Q CGKCAN HS1 1335 2025
2 . CZ 659 Q CANSFO HK1 1120 1055
3 . CZ 660 Q SFOCAN HK1 1255 #2210
4 . CZ 3037 Q CANCGK HS1 0840 1235

Do I need to apply transit visa?
I am told that to get the hotel accommodation during my transit, I need to show a transit G to the airline (China Southern Airlines) crew when I arrive Guangzhou.

I hold Indonesian passport.

Thanks in advance for the feedback.