eri: update from shamu

Change-Id: Ia9c52d8f55661cb92b78d76188462aaaa8e916f5
Merge "eri: update from shamu" into cm-12.0