Reenable CM features

These are back in place, re-enable them

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