Travel to Xi'an with an Australian passport

I am an Australian Citizen with an Australian passport and and planning to travel from Tokyo to Xi'an and travel within 72 hours back to Tokyo and then Australia. I should be eligible for the 72 hour VISA free transit permit- correct? Just to clarify the only way to apply for this permit is at the airport in Tokyo or Australia. Following this i will need to registered when i check into the hotel - is that also correct.

Many thanks