Merge upstream CM Kernel