Merge "LOCATION_PROVIDERS_ALLOWED fixes"