Update for EOS vendor updates

Change-Id: Ie743228c93fd86f34a1945d217567adfd42e6aef