There are going to be two different vehicles, based upon the same/similar design. There is an economy vehicle which will have steering wheel and pedals like any other car. It will be for sale/lease.
The "cybercab" is one that can easily have those removed.
Both will incorporate parts of the next gen platform which is a different process. The initial plan was for the entire vehicle to be use the "box method" but they decided to incorporate parts of it into their existing production line processes (for now).
My guess is they set up a basic line in Austin for the engineers to fine tune and production will first start in China. Tom Zhu was moved back to China for a reason and I dont think it was to oversee a megapack factory. I believe the first production line will go into China with him tasked on scaling it.
He is the one who oversaw the development and production of Giga Shanghai.