WiFi Reverts
Merge remote-tracking branch 'frameworks/jb-mr1' into jb-mr1