Merge proposals dependent on lp://staging/~thomas-voss/location-service/iterate-on-galileo-handling

1. iterate-on-galileo-handling
2. Dependent merge proposals