Update for EOS vendor updates

Change-Id: I28e9f0b1b92f6f2afe00f283582a5feac882ec42