Enable some CM options by default

Change-Id: Ieaac1abb8b99e97657dd2a74a3b78b974f46735d
Merge "Enable some CM options by default" into cm-10.1