Merge "Fix issue where location_hardware_provider is delivered through the passive provider" into udc-qpr-dev