Update for EOS vendor updates

Change-Id: I9c7ee3cebb313fcaa8561a9fd5ac293b2f0ba00d