Update for EOS vendor updates

Change-Id: I434c71ba8a449825d7a85048d36152199768b4b5