updated for Endeavoru

Change-Id: I2b99a6e744209e355ba103b4df4538cbfe2f9605