Update for EOS vendor updates

Change-Id: Iff592f3b0b0832f42e0cf45678f0cbb225c413bd