Merge "Remove XTRA URLs from gps.conf"