Kernel changes

Change-Id: Ib936a34107e049c76b5246166854337fd71cd10f