Merge "Removing GPS_LOCK conf. from gps.conf"