DO NOT DELETE - CM's kernel is a squash of this CAF merge