Last time when they switched from US to China, they asked everyone on order to reconfigure and confirm. I doubt that they will not do that path this time. The problem is the MIC Y and Fremont Y are using different battery.
Ops I may over think for this, are you order SR RWD Y? These are using same battery I think.