Intended Stay in China - Question 2.5 On Visa Application

I plan to travel to mainland China from December 29 - January 6 then Macau and Hong Kong from January 6 - 12. I am from the USA and do not need a visa to travel to Macau or Hong Kong, therefore would the correct answer to question 2.5 on the Application form be 8 days?