Need China Visa for Transit at Guangzhou ???

If Flight by China Southern, from Jakarta Indonesia and Transit at Guangzhou, less than 6 hours & connecting flight to New York USA. And for return flight is also transit at Guangzhou, from New York to Jakarta Indonesia.

Thanks