Merge branch 'Cyanogen/cm-10.2'