Reenable CM features

These are back in place, re-enable them

Change-Id: Ifdf7eb789708b359772d8c3acd4c88574b3daf45
Merge branch 'cm' into HEAD