Update for Eos 5.0

Change-Id: I4f7134ebfe58aacc87d7d7cd0e3b1c3970e571ce