Clean up:Not work and do wifi unstable
Merge remote-tracking branch 'upstream/cm-10.1' into jb2

Merge ugers upstream/cm-10.1