Merge with CM Kernel

Change-Id: I2024e1d8a2683c3f4c2e51168879a94e0dd7fc69