Sync to CM10.2