Merge "Fix up LocationRequest and ProviderRequest" into rvc-dev