Clean perms that are been called from cm common init.

Change-Id: Idc31a51d88e90b94340eb73b74c948f8870354c3
Merge remote-tracking branch 'cm/cm-11.0' into HEAD