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

Change-Id: I059e9727673ad650e8071264675b0f2c491d6319