Canadian With Stopover in Shamghai

I am a Canadian citizen travelling Vancouver to Tokyo. I am planning a short trip (68 hour stay) to Shanghai from Tokyo, then Shanghai to Vancouver with a 9 hour plane change in Tokyo. Do I qualify for a 72 hour stay without visa in Shanghai? If so, is it correct the documentation I need is my passport, return airline ticket and a customs card given me by the airline?

Thanks, Drew