Resynced with cm10.2

Fixed missing repo's back to CM's main code.