Changes in kernel of mako - n4

Change-Id: I3240a840fb633a7968f69712b2623236133b9931