Merge "Fix up LocationRequest and ProviderRequest" into rvc-dev am: 240eaaaaab

Change-Id: I9c69e5a0718ab31f04ed4076af5f6e54eb149c50