disable local gps.conf
Merge remote-tracking branch 'kbc/cm-10.2' into cm-10.2