Merge proposals dependent on lp://qastaging/~thomas-voss/location-service/fix-1219164

lp://qastaging/~thomas-voss/location-service/fix-1219164 has no merge proposals.