merge in cm-10.2 stuff + fix conflict in gps