[Merge] lp:~thomas-voss/location-service/fix-1352785 into lp:location-service

[Manuel de la Peña]

Review: Approve

Code looks ok but it looks like the build times out after 2 hours. Something is getting stuck in all of the platforms after the tests have been passed.
-- 
https://code.launchpad.net/~thomas-voss/location-service/fix-1352785/+merge/229962
Your team Ubuntu Phablet Team is subscribed to branch lp:location-service.