Follew CM kernel as Grpoj developers are pushing there

Change-Id: Iaa22c82c866d904d6ed51b362621c809e9e58b22