Adapt mako to e970

Change-Id: I376fb416cba3b9e31e86ca1d89be61247832bd64