EOS build touch up

Change-Id: Ifec76e0fc172225a642346da5db6c14aaff682d4