430
Tesla Shareholders Approve Musk's $56 Billion Pay Package in Early Voting
(www.ibtimes.co.uk)
This is a most excellent place for technology news and articles.
Looks like only the S and X still use 18650s. The 3 and Y are using larger 2170 cells and apparently they're also buying from LG not just Panasonic.
Some use the larger cells, but not all. They apparently are a bust and don't offer increased energy density like they had originally claimed.
The lfp cells come from China, and are now being heavily taxed.