Merge "GPS: remove some logging" into gingerbread