Short term I wonder about staging at the factory with Model 3 & Y at close the 1 Million and a mix of Chinese and export shipments.
Short term a lot of that Watermelon farm can be turned into a staging area, specifically export staging.
If they are going to build Model 2 at GF Shanghai they may need more land or a multi-level car park?
EDIT: I've looked at video, if they have purchased the whole watermelon farm, it is a big chunk of land, it may be big enough to do staging and Model 2.
At present they are using a car park close to the factory for Chinese Model 3 staging, it is only a few minutes drive, but it seems workers drive cars there and return in a bus.
I've got similar thoughts on Fremont, if they are going to add a fancy new paint shop and structural pack casting, they need the space.
A multi-level car park at Fremont is one way of freeing up some space.
Building a new paint shop and casting at Fremont, while minimizing production disruption is challenging. Waiting until Austin is producing Model Y is sensible.