eri: update from shamu

Change-Id: If645a01b16b3ae598ab835e002d2741680e05726