Changes for kernel

Change-Id: I1f48844b715237fbd0e16555a1a8b1950b5d4727