I have a 2017 Model S 100D AP2.5 w/ EAP. I was considering getting the infotainment upgrade and was also looking at the FSD computer just to get it all done at once. I was setting up an appointment for the upgrade and was told that doing the infotainment upgrade will include the new FSD...