kernel changes

Change-Id: I0ea20095ca726dbb73ab30f48d1d4050d57b70ba