Adding in WiFi modules
Merge remote-tracking branch 'upstream/cm-10.1' into jb-mr1