update e980 for cm-11 branches