Initial changes for new kernel

Change-Id: I7da0fa7d7c0331118d622a00d168b8bd291ecac3