Merge latest kernel chnages from CM