Scratch Toyota off the list of posssible OEMs looking at the Electrovaya solid state battery. They have just signed an agreement with Idemitsu Kosan Co.,Ltd. to develop a manufacturing process for their solid stste battery cell. Toyota has a soild state battery cell but can not manufacture it economically and at scale.
https://batteriesnews.com/idemitsu-and-toyota-announce-beginning-of-cooperation-toward-mass-production-of-all-solid-state-batteries-for-bevs/