mako kernel r2

Change-Id: I2ded878be25f4ff0d8d2efb789bea7ccb6eb3c87