kernel changes

Change-Id: I3228dcef70ec1c7ccf595a45f2b358436db09009