Rebase Kernel

Change-Id: I1bcb96b4bafac107c3daf5ed728ed07b975ec214