Remove Wi-Fi control from previous AppOps commits - TEMP fix (1/2)
Merge branch 'origin/cm-11.0'