Revert "Revert "kernel to cm-11-r3p2 branch""

This reverts commit cfe7bf42700b79249894346028040ce49e851403.