Merge CM10.2 from Cyanogenmod