cm: Update and add additional permissions

Change-Id: Iec6a6938209d8bdfa9f8cdc31a9929d2fbc27f76
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0