Do I need to apply for a visa for short stays during transit?

My flight arrives in Shanghai at 7.30am Friday 6 May 2016 (NZ289) and my departure is on OS76 leaving at 10.50am on Monday 9 May 2016. I understand for a short transit stay I may not need to obtain an entry permit prior to arrival. I am a New Zealand passport holder and was born here.

I intend to stop over in Hong Kong on my way back from Europe arriving 4.30pm Tuesday 14 June departing 10.45pm Thursday 16 June