Reenable CM features

These are back in place, re-enable them

Change-Id: Ia2f2f04828f5c934f167335e6a82b135aa74946f
Merge CM12 updates