Merge "Fix broken location extras in GpsLocationProvider."