Merge "GPS Provider Service changes"